From 871cffb8bf30f1cf2c3103ef34406039696bb133 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 30 四月 2025 14:45:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 123 +++++-
WebTM/views/基础资料/公用基础资料/Gy_ProjectMoney.html | 30 +
WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterUnitList.html | 26 +
WebTM/views/基础资料/公用基础资料/Gy_QCCheckClass.html | 34 +
WebTM/views/基础资料/公用基础资料/Gy_OrderBackInfo.html | 33 +
WebTM/views/Baseset/基础资料/Sc_ProcessExchangeBillListView.html | 70 ++-
WebTM/views/基础资料/公用基础资料/Gy_CheckNoteItem.html | 31 +
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillList_PDA.html | 2
WebTM/views/基础资料/生产基础资料/Gy_Post.html | 31 +
WebTM/views/基础资料/公用基础资料/Gy_PreventErrMould.html | 32 +
WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html | 12
WebTM/views/home/console.html | 26 +
WebTM/views/基础资料/销售基础资料/Gy_Customer.html | 24 +
WebTM/views/基础资料/公用基础资料/Gy_Unit.html | 27 +
WebTM/views/基础资料/公用基础资料/Gy_MaintainLev.html | 31 +
WebTM/views/基础资料/公用基础资料/Gy_CusType.html | 31 +
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillList.html | 20 +
WebTM/views/基础资料/公用基础资料/Gy_OrderLev.html | 35 +
WebTM/views/基础资料/公用基础资料/Gy_PackType.html | 21 +
WebTM/views/基础资料/基础资料/Gy_RepairCheckClass.html | 24 +
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 24 +
WebTM/views/基础资料/基础资料/Gy_EquipStatus.html | 31 +
WebTM/views/基础资料/生产基础资料/Gy_ShiftsList.html | 27 +
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBillSumSave.html | 6
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_PreventErrMould.html | 2
WebTM/views/基础资料/公用基础资料/Gy_SupType.html | 32 +
WebTM/views/系统管理/用户管理/Xt_UserListEdit.html | 31 +
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | 2
WebTM/views/基础资料/公用基础资料/Gy_ProjectMoneyClass.html | 31 +
WebTM/views/基础资料/基础资料/Gy_ConkReasonList.html | 32 +
WebTM/views/模治具管理/模治具点检保养/Sc_MouldMaintainBill_PDA.html | 3
WebTM/views/基础资料/公用基础资料/Gy_TemporaryArea.html | 28 +
WebTM/views/基础资料/基础资料/Gy_MouldStatus.html | 31 +
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 21 +
WebTM/views/基础资料/公用基础资料/Gy_EnvironmentTestItem.html | 8
WebTM/views/基础资料/公用基础资料/Gy_Currency.html | 27 +
WebTM/views/基础资料/公用基础资料/Gy_ConkType.html | 21 +
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 8
38 files changed, 958 insertions(+), 70 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 32e538e..f71435e 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"
@@ -18,7 +18,7 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护鍒�</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="Value" id="Value" lay-verify="Value" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" autocomplete="off">
+ <input type="text" class="layui-input" name="Value" id="Value" lay-verify="Value" value="" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" autocomplete="off">
</div>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
@@ -33,12 +33,19 @@
<script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<script>
//寮曠敤鐨勫崟鎹強妯″潡锛氬伐搴忔祦杞崱銆�
- layui.use(['table', 'form', 'layer'], function () {
+ layui.use(['table', 'form', 'layer'], function () {
var table = layui.table
, form = layui.form
, layer = layui.layer;
+
+ var sWhere = "";
+
+ var params = get_UrlVars();
+ var HProcID = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 宸ュ簭id
+ var HSourceID = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鐢熶骇璧勬簮id
form.on('submit(HQuery)', function () {//閫夋嫨鍗曚綅
//var sMainStr = JSON.stringify(table.cache['mainTable']);
@@ -64,6 +71,29 @@
});
//#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
+
+
table.render({
elem: '#mainTable'
// , url: '/demo/table/user/'
@@ -86,16 +116,19 @@
, { field: 'HWorkerID', width: 150, title: 'HWorkerID', hide: true }
, { field: 'HSourceID', width: 150, title: 'HSourceID', hide: true }
, { field: 'HBillType', width: 150, title: 'HBillType', hide: true }
- , { field: '鏃ユ湡', width: 150, title: '鏃ユ湡' }
- , { field: '鍗曟嵁鍙�', width: 150, title: '鍗曟嵁鍙�' }
- , { field: '浠诲姟鍗曞彿', width: 150, title: '浠诲姟鍗曞彿' }
- , { field: '鐢熶骇璁㈠崟鍙�', width: 150, title: '鐢熶骇璁㈠崟鍙�' }
- , { field: '鐢熶骇杞﹂棿浠ｇ爜', width: 150, title: '鐢熶骇杞﹂棿浠ｇ爜' }
+ , { field: '鏃ユ湡', width: 150, title: '鏃ユ湡',templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+ , { field: '鍗曟嵁鍙�', width: 170, title: '鍗曟嵁鍙�' }
+ , { field: '宸ュ簭', width: 140, title: '宸ュ簭' }
+ , { field: '鐢熶骇璧勬簮', width: 150, title: '鐢熶骇璧勬簮' }
+ , { field: '宸ヤ綔涓績', width: 150, title: '宸ヤ綔涓績' }
+ , { field: '浠诲姟鍗曞彿', width: 170, title: '浠诲姟鍗曞彿' }
, { field: '鐢熶骇杞﹂棿', width: 150, title: '鐢熶骇杞﹂棿' }
, { field: '浜у搧浠ｇ爜', width: 150, title: '浜у搧浠ｇ爜' }
, { field: '浜у搧', width: 150, title: '浜у搧' }
- , { field: '瑙勬牸鍨嬪彿', width: 150, title: '瑙勬牸鍨嬪彿' }
, { field: '鎵瑰彿', width: 150, title: '鎵瑰彿' }
+ , { field: '鐢熶骇璁㈠崟鍙�', width: 170, title: '鐢熶骇璁㈠崟鍙�' }
+ , { field: '鐢熶骇杞﹂棿浠ｇ爜', width: 150, title: '鐢熶骇杞﹂棿浠ｇ爜' }
+ , { field: '瑙勬牸鍨嬪彿', width: 150, title: '瑙勬牸鍨嬪彿' }
, { field: '鍗曚綅浠ｇ爜', width: 150, title: '鍗曚綅浠ｇ爜' }
, { field: '鍗曚綅', width: 150, title: '鍗曚綅' }
, { field: '鐢熶骇鏁伴噺', width: 150, title: '鐢熶骇鏁伴噺' }
@@ -113,8 +146,7 @@
, { field: '濮斿鍔犲伐鍗曚綅', width: 150, title: '濮斿鍔犲伐鍗曚綅' }
, { field: '琛ㄥご澶囨敞', width: 150, title: '琛ㄥご澶囨敞' }
, { field: '宸ュ簭鍙�', width: 150, title: '宸ュ簭鍙�' }
- , { field: '宸ュ簭浠ｇ爜', width: 150, title: '宸ュ簭浠ｇ爜' }
- , { field: '宸ュ簭', width: 150, title: '宸ュ簭' }
+ , { field: '宸ュ簭浠ｇ爜', width: 150, title: '宸ュ簭浠ｇ爜' }
, { field: '鍔犲伐璇存槑', width: 150, title: '鍔犲伐璇存槑' }
, { field: '宸ヤ綔涓績浠ｇ爜', width: 150, title: '宸ヤ綔涓績浠ｇ爜' }
, { field: '宸ヤ綔涓績', width: 150, title: '宸ヤ綔涓績' }
@@ -124,8 +156,7 @@
, { field: '鐝粍', width: 150, title: '鐝粍' }
, { field: '鎿嶄綔宸ヤ唬鐮�', width: 150, title: '鎿嶄綔宸ヤ唬鐮�' }
, { field: '鎿嶄綔宸�', width: 150, title: '鎿嶄綔宸�' }
- , { field: '鐢熶骇璧勬簮浠ｇ爜', width: 150, title: '鐢熶骇璧勬簮浠ｇ爜' }
- , { field: '鐢熶骇璧勬簮', width: 150, title: '鐢熶骇璧勬簮' }
+ , { field: '鐢熶骇璧勬簮浠ｇ爜', width: 150, title: '鐢熶骇璧勬簮浠ｇ爜' }
, { field: '璁″垝鏁伴噺', width: 150, title: '璁″垝鏁伴噺' }
, { field: '娴佽浆鍗℃暟閲�', width: 150, title: '娴佽浆鍗℃暟閲�' }
, { field: '鏃堕棿鍗曚綅', width: 150, title: '鏃堕棿鍗曚綅' }
@@ -174,18 +205,19 @@
, limit: 50
});
///鍔犺浇鏄剧ず鏁版嵁
- function RoadQuery(Where) {
- var index = layer.load();
- var Value = Where;
- if (Value == null) {
- Value = '';
+ function RoadQuery(Value) {
+ var index = layer.load();
+ if (Value != "") {
+ sWhere = " and 鍗曟嵁鍙� like '%" + Value + "%' ";
+ }
+ if (HProcID != '' && HSourceID != '' && HProcID != undefined && HSourceID != undefined) {
+ sWhere += ' and HProcID=' + HProcID + ' and HSourceID=' + HSourceID+''
}
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetSc_ProcessExchangeBillListView",
async: true,
- data: { "ICMOBill": Value, "OrganizationID": sessionStorage["OrganizationID"] },
- //data: { "Value": Value },
+ data: { "sWhere": sWhere, "OrganizationID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index 10cd98e..edcba28 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -228,6 +228,25 @@
}
});
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '涓婚') {
+ var linterid = data.HInterID.toString();
+ var HEntryID = data.HEntryID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鍏憡'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../绯荤粺绠＄悊/鍏憡/GG_NoticeBillEdit.html?OperationType=3&linterid=' + linterid + '&HEntryID=' + HEntryID+'&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ }
+ })
+ }
+ });
+
$('.FastMenu_1').on('click', 'ul li', function (event) {
// 杩欓噷鍐欎綘鐨勭偣鍑讳簨浠跺鐞嗕唬鐮�
console.log('List item clicked:', $(this).text());
@@ -385,6 +404,13 @@
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) {
//int
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_PreventErrMould.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_PreventErrMould.html"
index 7a020cd..753e8aa 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_PreventErrMould.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_PreventErrMould.html"
@@ -274,7 +274,7 @@
$("#HCREATEORGID").attr("disabled", true);
$("#HStopflag").attr("disabled", true);
$("#HUseFlag").attr("disabled", true);
- layui.form.render('checkbox');s
+ layui.form.render('checkbox');
Organ();
}
//鏃犳簮鍗曟柊澧�
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_CheckNoteItem.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_CheckNoteItem.html"
index a58dc12..2a4b849 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_CheckNoteItem.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_CheckNoteItem.html"
@@ -308,6 +308,30 @@
});
})
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍚姩妫�鏌ラ」鐩唬鐮�') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鍚姩妫�鏌ラ」鐩�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckNoteItem.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#region 鍙屽嚮杩斿洖鏁版嵁
table.on('rowDouble(mainTable)', function (obj) {
@@ -374,6 +398,13 @@
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) {
//int
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_ConkType.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_ConkType.html"
index 6aea22f..a09b965 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_ConkType.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_ConkType.html"
@@ -305,6 +305,20 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鏁呴殰绫诲埆浠ｇ爜') {
+ var linterid = data.hitemid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏁呴殰绫诲埆鍒楄〃-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ConkType.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ })
+ }
+ });
+
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -368,6 +382,13 @@
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) {
//int
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_Currency.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_Currency.html"
index 40b01c4..148170d 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_Currency.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_Currency.html"
@@ -231,6 +231,13 @@
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) {
//int
@@ -381,6 +388,26 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '璐у竵浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫璐у竵璁剧疆'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Currency.html?hID=' + hID
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ })
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
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_CusType.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_CusType.html"
index ddb0246..f04284c 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_CusType.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_CusType.html"
@@ -214,6 +214,30 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '瀹㈡埛鍒嗙被浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫瀹㈡埛鍒嗙被'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_CusType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -301,6 +325,13 @@
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) {
//int
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_EnvironmentTestItem.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_EnvironmentTestItem.html"
index 85eafbb..b857e1e 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_EnvironmentTestItem.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_EnvironmentTestItem.html"
@@ -391,8 +391,12 @@
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 if (data[i].name == '妫�娴嬩唬鐮�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '妫�娴嬩唬鐮�' });
+ } 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) {
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_MaintainLev.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_MaintainLev.html"
index ed7ddda..8a86d0d 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_MaintainLev.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_MaintainLev.html"
@@ -283,6 +283,30 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '淇濆吇绾у埆浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫淇濆吇绾у埆'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MaintainLev.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -372,6 +396,13 @@
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) {
//int
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_OrderBackInfo.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_OrderBackInfo.html"
index c86a9b3..c0bfda4 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_OrderBackInfo.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_OrderBackInfo.html"
@@ -154,7 +154,33 @@
get_FastQuery();
});
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍙嶉鐘舵�佷唬鐮�') {
+ var hID = data.HItemID.toString();
+ TagParentId = 0;
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['55%', '55%']
+ , title: '缂栬緫璁㈠崟鍙嶉鐘舵��'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderBackInfo.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#endregion
@@ -295,6 +321,13 @@
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) {
//int
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_OrderLev.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_OrderLev.html"
index 4c99cf8..774c8ae 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_OrderLev.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_OrderLev.html"
@@ -159,6 +159,34 @@
get_FastQuery();
});
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '璁㈠崟绛夌骇浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ TagParentId = 0;
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['55%', '55%']
+ , title: '缂栬緫璁㈠崟绛夌骇'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderLev.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -339,6 +367,13 @@
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) {
//int
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_PackType.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_PackType.html"
index bb146f3..cc85f52 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_PackType.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_PackType.html"
@@ -199,6 +199,20 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍖呰鏂瑰紡浠ｇ爜') {
+ var linterid = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鍖呰鏂瑰紡鍒楄〃-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_PackType.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ })
+ }
+ });
+
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -267,6 +281,13 @@
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) {
//int
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_PreventErrMould.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_PreventErrMould.html"
index bfab982..8e33120 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_PreventErrMould.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_PreventErrMould.html"
@@ -287,6 +287,31 @@
});
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '闃查敊瑁呯疆浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫闃查敊瑁呯疆'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_PreventErrMould.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -374,6 +399,13 @@
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) {
//int
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_ProjectMoney.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_ProjectMoney.html"
index ac1661c..5bd7a18 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_ProjectMoney.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_ProjectMoney.html"
@@ -281,6 +281,29 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '椤圭洰璐圭敤浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫椤圭洰璐圭敤'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ProjectMoney.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -370,6 +393,13 @@
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) {
//int
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_ProjectMoneyClass.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_ProjectMoneyClass.html"
index aeadd9d..156d1dc 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_ProjectMoneyClass.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_ProjectMoneyClass.html"
@@ -304,6 +304,30 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '椤圭洰璐圭敤鍒嗙被浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫-椤圭洰璐圭敤鍒嗙被'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ProjectMoneyClass.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -384,6 +408,13 @@
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) {
//int
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 e275bb0..1eb2d5c 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"
@@ -366,6 +366,33 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ TagParentId = data.ParentID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫妫�楠岄」鐩被鍒�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html?hID=' + hID + '&HType=3&TagParentId=' + TagParentId + '', 'yes']
+
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//浠ｇ爜鍥炶溅鏂规硶
$('#HNumber').on('keydown', function (event) {
if (event.keyCode == 13) {
@@ -534,6 +561,13 @@
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) {
//int
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_SupType.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_SupType.html"
index 29b9bef..335ad35 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_SupType.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_SupType.html"
@@ -214,6 +214,31 @@
});
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '渚涘簲鍟嗗垎绫讳唬鐮�') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫渚涘簲鍟嗗垎绫�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_SupType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -301,6 +326,13 @@
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) {
//int
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_TechnologyParameterUnitList.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_TechnologyParameterUnitList.html"
index 01d9858..3dab3ac 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_TechnologyParameterUnitList.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_TechnologyParameterUnitList.html"
@@ -216,6 +216,25 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '宸ヨ壓鍙傛暟鍗曚綅浠ｇ爜') {
+ var linterid = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ヨ壓璁剧疆-缂栬緫'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Gy_TechnologyParameterUnit_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
@@ -316,6 +335,13 @@
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) {
//int
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_TemporaryArea.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_TemporaryArea.html"
index 7500d47..b017c12 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_TemporaryArea.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_TemporaryArea.html"
@@ -172,6 +172,27 @@
});
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鏆傛斁鍖轰唬鐮�') {
+ var linterid = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏆傛斁鍖�-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_TemporaryArea.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ btn1: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ window.location.reload();
+ }
+ })
+ }
+ });
+
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
//閫変腑琛屾敼鍙橀鑹�
@@ -254,6 +275,13 @@
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) {
//int
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_Unit.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_Unit.html"
index cba7ddc..573470b 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_Unit.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_Unit.html"
@@ -237,6 +237,13 @@
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) {
//int
@@ -400,6 +407,26 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '璁￠噺鍗曚綅浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫璁￠噺鍗曚綅'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html?hID=' + hID
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 鍙屽嚮杩斿洖鏁版嵁
table.on('rowDouble(mainTable)', function (obj) {
var data = [];
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_ConkReasonList.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_ConkReasonList.html"
index cd6bcc7..07e2822 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_ConkReasonList.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_ConkReasonList.html"
@@ -296,6 +296,31 @@
parent.layer.close(index);
});
//#endregion
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鏁呴殰鍘熷洜浠ｇ爜') {
+ var hID = data.hitemid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫涓嶈壇鍘熷洜'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_ConkReasonEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#endregion
@@ -357,6 +382,13 @@
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) {
//int
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_EquipStatus.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_EquipStatus.html"
index 06af196..2cf0de3 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_EquipStatus.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_EquipStatus.html"
@@ -170,6 +170,30 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫璁惧鐘舵��'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_EquipStatusEdit.html?hID=' + hID
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ }
+ })
+ }
+ });
+
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -231,6 +255,13 @@
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) {
//int
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_MouldStatus.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_MouldStatus.html"
index f631049..95de7ab 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_MouldStatus.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_MouldStatus.html"
@@ -164,6 +164,30 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鍣ㄥ叿鐘舵��'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_MouldStatusEdit.html?hID=' + hID
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ }
+ })
+ }
+ });
+
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
get_FastQuery();
@@ -231,6 +255,13 @@
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) {
//int
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_RepairCheckClass.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_RepairCheckClass.html"
index a5c18b7..d633287 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_RepairCheckClass.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_RepairCheckClass.html"
@@ -306,6 +306,23 @@
$("#btnSearch").click();
set_ClearQuery();
});
+
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '缁翠慨楠屾敹椤圭洰鍒嗙被浠ｇ爜') {
+ var linterid = data.HItemID.toString();
+ var linteridSub = data.hsubid;
+
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缁翠慨楠屾敹椤圭洰鍒嗙被-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鍩虹璧勬枡/Gy_RepairCheckClassEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
+ })
+ }
+ });
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -405,6 +422,13 @@
field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�'
})
}
+ 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) {
//int
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Post.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Post.html"
index 2d5a9d6..2d0c5d0 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Post.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Post.html"
@@ -331,6 +331,30 @@
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '宀椾綅浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫宀椾綅'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Post.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 姝ら〉闈㈡墍鏈夋柟娉�
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
@@ -380,6 +404,13 @@
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) {
//int
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsList.html"
index dabe1f5..efbedce 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsList.html"
@@ -375,6 +375,26 @@
})
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鐝浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鐝-缂栬緫'
+ , shift: 0 //寮瑰嚭鍔ㄧ敾
+ , content: '../鐢熶骇鍩虹璧勬枡/Gy_ShiftsEdit.html?OperationType=2&HItemID=' + hID
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ end: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btn_Search").trigger('click');
+ }
+ })
+ }
+ });
+
//#region 鍙屽嚮杩斿洖鏁版嵁
table.on('rowDouble(mainTable)', function (obj) {
var data = [];
@@ -879,6 +899,13 @@
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) {
//int
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index d4cb2dd..b03540c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -310,6 +310,23 @@
set_ClearQuery();
});
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '渚涘簲鍟嗕唬鐮�') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '渚涘簲鍟嗗熀纭�璧勬枡'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html?OperationType=3&linterid=' + hID]
+ , resize: false
+ })
+ }
+ });
+
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
if (page != 1) {
@@ -513,6 +530,13 @@
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) {
//int
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index f4a058e..0ee8db4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -330,6 +330,23 @@
});
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '瀹㈡埛浠ｇ爜') {
+ var hID = data.HItemID.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '瀹㈡埛鍩虹璧勬枡'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['Gy_Customer_Edit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=']
+ , resize: false
+ })
+ }
+ });
+
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
if (page != 1) {
@@ -558,6 +575,13 @@
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) {
//int
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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html"
index 03db667..10584d5 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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.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\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html"
@@ -550,6 +550,9 @@
}
$("#HMouldMaintainRuleInterNo").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HMouldMaintainRuleInterID").val(checkStatus.data[0].hmainid);
+ $("#HPlanNo").val(checkStatus.data[0].淇濆吇璁″垝鍙�);
+ $("#HMouldMaintainPlanInterID").val(checkStatus.data[0].淇濆吇璁″垝id);
+ $("#HMouldMaintainPlanEntryID").val(checkStatus.data[0].淇濆吇璁″垝瀛恑d);
get_DocCheckItem2();
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
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 6ef5129..3a863e1 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"
@@ -796,7 +796,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3819' },
+ data: { "HBillType": '3818' },
success: function (d) {
$("#HInterID").val(0);
$("#HPlanInterID").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/Sc_MouldMaintainRuleBillList_PDA.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_PDA.html"
index 9907986..5736457 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_PDA.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_PDA.html"
@@ -137,7 +137,7 @@
var option1 = [];
var option2 = [];
var HModName = "Sc_MouldMaintainRuleBillList_PDA";
- var titleData = ["HInterID","hmainid", "鍗曟嵁绫诲瀷", "閰嶄欢ID", "鍗曚綅ID", "璐熻矗浜轰唬鐮�", "琛屽叧闂汉", "浣滃簾鏃ユ湡", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "鍐呴儴鍗曟嵁鍙�", "hsubid", "淇濆吇椤圭洰ID", "璐熻矗浜篒D"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HInterID", "hmainid", "鍗曟嵁绫诲瀷", "閰嶄欢ID", "鍗曚綅ID", "璐熻矗浜轰唬鐮�", "琛屽叧闂汉", "浣滃簾鏃ユ湡", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "鍐呴儴鍗曟嵁鍙�", "hsubid", "淇濆吇椤圭洰ID", "璐熻矗浜篒D", "淇濆吇璁″垝id","淇濆吇璁″垝瀛恑d"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
//#region 銆愯繃婊ゆ柟妗堛��
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 fce8e8d..69a82f8 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"
@@ -1130,6 +1130,8 @@
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
if (obj.event == "HRelationBillNo") {
+ var HProcID = $("#HProcID").val();
+ var HSourceID = $("#HSourceID").val();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1138,7 +1140,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html?HProcID=' + HProcID + '&HSourceID=' + HSourceID+'', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1148,7 +1150,7 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- if ($("#HMaterName").val() == checkStatus.data[0].浜у搧 && $("#HProcName").val() == checkStatus.data[0].宸ュ簭) {
+ if ($("#HSourceName").val() == checkStatus.data[0].鐢熶骇璧勬簮 && $("#HProcName").val() == checkStatus.data[0].宸ュ簭) {
obj.update({
"HProcExchInterID": checkStatus.data[0].hmainid
, "HProcExchEntryID": checkStatus.data[0].hsubid
@@ -1171,14 +1173,14 @@
})
}
else {
- return layer.msg("閫夋嫨鍓骇璁″垝鍗曠殑鐗╂枡涓庡伐搴�,璺熷綋鍓嶅伐鍗曚笉鍖归厤");
+ return layer.msg("閫夋嫨鍓骇璁″垝鍗曠殑鐢熶骇璧勬簮涓庡伐搴�,璺熷綋鍓嶇敓浜ц祫婧愪笌宸ュ簭涓嶅尮閰�");
}
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
, end: function () {
- if ($("#HMaterName").val() == OptionData[0].浜у搧 && $("#HProcName").val() == OptionData[0].宸ュ簭) {
+ if ($("#HSourceName").val() == OptionData[0].鐢熶骇璧勬簮 && $("#HProcName").val() == OptionData[0].宸ュ簭) {
obj.update({
"HProcExchInterID": OptionData[0].hmainid
, "HProcExchEntryID": OptionData[0].hsubid
@@ -1200,7 +1202,7 @@
})
} else {
- return layer.msg("閫夋嫨鍓骇璁″垝鍗曠殑鐗╂枡涓庡伐搴�,璺熷綋鍓嶅伐鍗曚笉鍖归厤");
+ return layer.msg("閫夋嫨鍓骇璁″垝鍗曠殑鐢熶骇璧勬簮涓庡伐搴�,璺熷綋鍓嶇敓浜ц祫婧愪笌宸ュ簭涓嶅尮閰�");
}
OptionData = [];
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html"
index cbf8154..19d621a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html"
@@ -434,7 +434,7 @@
table.render(option);
for (var i = 1; i <= option.data.length; i++) {
$('#HBadReason' + i + '').val(option.data[i - 1].HBadReasonNumber);
- $('#HBadPhenomenabtn' + i + '').val(option.data[i - 1].HBadPhenomenaName);
+ $('#HBadPhenomena' + i + '').val(option.data[i - 1].HBadPhenomenaName);
}
form.render('select');
break;
@@ -454,7 +454,7 @@
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
for (var i = 1; i <= option.data.length; i++) {
$('#HBadReason' + i + '').val(option.data[i - 1].HBadReasonNumber);
- $('#HBadPhenomenabtn' + i + '').val(option.data[i - 1].HBadPhenomenaName);
+ $('#HBadPhenomena' + i + '').val(option.data[i - 1].HBadPhenomenaName);
}
form.render('select');
}
@@ -531,7 +531,7 @@
"HBadPhenomenaID": checkStatus.data[0].HItemID
, "HBadPhenomenaName": checkStatus.data[0].涓嶈壇鐜拌薄鍚嶇О
})
- $("#HBadPhenomenaName" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].涓嶈壇鐜拌薄鍚嶇О)
+ $("#HBadPhenomena" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].涓嶈壇鐜拌薄鍚嶇О)
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
index 5ad4715..9d7417c 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
@@ -63,7 +63,7 @@
<div class="layui-inline">
<label class="layui-form-label">鐢ㄦ埛鍚�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="Czymc" id="Czymc" autocomplete="off" style="float:left;width:150px;">
+ <input type="text" class="layui-input" name="Czymc" lay-verify="Czymc" id="Czymc" autocomplete="off" style="float:left;width:150px;" readonly>
<button type="button" lay-submit="" class="layui-btn" lay-filter="CzymcList" style="width: 40px; display: none;">
<i style="margin-left:-9px;">閲嶇疆</i>
</button>
@@ -74,7 +74,7 @@
<div class="layui-inline">
<label class="layui-form-label">瀵嗙爜</label>
<div class="layui-input-inline">
- <input type="password" class="layui-input" name="Czmm" id="Czmm" value="">
+ <input type="password" class="layui-input" name="Czmm" id="Czmm" value="" autocomplete="new-password" readonly>
</div>
</div>
<div class="layui-inline">
@@ -354,7 +354,7 @@
var closeType = params[params[3]]; //鍏抽棴绫诲瀷
}
-
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -384,8 +384,10 @@
if (OperationType == 1) {//鏃犳簮鏂板
Sav = "Add";
$('#Czybm').attr("disabled", false);
- $('#Czymc').attr("disabled", false);
- $('#Czmm').attr("disabled", false);
+ //$('#Czymc').attr("disabled", false);
+ //$('#Czmm').attr("disabled", false);
+ //$('#Czymc').prop('readonly', false);
+ //$('#Czmm').prop('readonly', false);
$('#Czyyz').attr("disabled", false);
$('#Explain').attr("disabled", false);
@@ -393,8 +395,10 @@
else if (OperationType == 3) {//缂栬緫
Sav = "Update";
$('#Czybm').attr("disabled", true);
- $('#Czymc').attr("disabled", true);
- $('#Czmm').attr("disabled", true);
+ $('#Czymc').prop('readonly', true);
+ //$('#Czymc').attr("disabled", true);
+ $('#Czmm').prop('readonly', true);
+ //$('#Czmm').attr("disabled", true);
$('#Czyyz').attr("disabled", true);
$('#Explain').attr("disabled", false);
@@ -499,6 +503,19 @@
btnHCheckEmp();
});
+ $('#Czymc').focus(function () {
+ if (OperationType == 1) {
+ $('#Czymc').prop('readonly', false);
+ }
+
+ });
+
+ $('#Czmm').focus(function () {
+ if (OperationType == 1) {
+ $('#Czmm').prop('readonly', false);
+ }
+ });
+
//淇濆瓨
form.on('submit(Saver)', function (data) {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index e62ea36..12bd577 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -1409,7 +1409,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html?Type=HTechParamList&OperationType=2', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html?Type=HTechParamList', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1687,6 +1687,7 @@
data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
success: function (result) {
if (result.count == 1) {
+ HSendDDMeg(HInterID);
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
@@ -1705,6 +1706,24 @@
}
//#endregion
+ //#region 瀹℃牳鍚庡彂閫佷俊鎭�
+ function HSendDDMeg(HInterID) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/SB_EquipICMOTechParamBillController/HSendDDMeg",
+ async: true, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID },
+ success: function (result) {
+ if (result.count != 1) {
+ layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //#endregion
+
//#region 閫�鍑�
form.on('submit(btn_Cancel)', function () {
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillList.html"
index 8f4e372..f934838 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillList.html"
@@ -591,6 +591,7 @@
data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
success: function (result) {
if (result.count == 1) {
+ HSendDDMeg(HInterID);
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
@@ -618,6 +619,25 @@
}
//#endregion
+
+ //#region 瀹℃牳鍚庡彂閫佷俊鎭�
+ function HSendDDMeg(HInterID) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/SB_EquipICMOTechParamBillController/HSendDDMeg",
+ async: true, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+ data: { "HInterID": HInterID},
+ success: function (result) {
+ if (result.count != 1) {
+ layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ }, error: function () {
+ layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ }
+ //#endregion
+
//#region 鍏抽棴锛坣um=1锛�/鍙嶅叧闂紙num=2锛�
function set_CloseBill(num) {
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 4861e36..a5f3f40 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"
@@ -71,9 +71,9 @@
</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 type="text" class="layui-input" name="HBarCode" id="HBarCode">
+ <input type="text" class="layui-input" name="HBarCode" id="HBarCode" value="">
</div>
</div>
</div>
@@ -1644,6 +1644,10 @@
layer.msg("璇烽�夋嫨璁惧鐘舵�侊紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HBarCode").val() == '' || $("#HBarCode").val() == null) {
+ layer.msg("璇疯緭鍏ユ潯褰㈢爜锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
return Result;
}
</script>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
index 9c06a52..4fe43a7 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
@@ -509,10 +509,12 @@
var x_PPK = 0;
var x_CPK = 0;
var numCount = 0
+ //绯绘暟 涓嶅彉鐨�
var c4 = [0.7979, 0.8862, 0.9213, 0.9400, 0.9515, 0.9594, 0.9650, 0.9693, 0.9727, 0.9754, 0.9776, 0.9794, 0.9810, 0.9823, 0.9835, 0.9845, 0.9854, 0.9862, 0.9869, 0.9876, 0.9882, 0.9887, 0.9892, 0.9896];
+ //骞冲潎鍊肩殑骞冲潎鍊�
for (var j = 1; j < option.cols[0].length; j++) {
- if (optionAVG.length != 0 || optionS.length != 0) {
+ if (optionAVG.length != 0 || optionS.length != 0) {
x_AVG = calc(x_AVG, parseFloat(optionAVG[0][option.cols[0][j].field]), "+");
}
}
@@ -520,6 +522,7 @@
x_AVG = $("#HCenterline_X").val() == "" ? x_AVG : parseFloat($("#HCenterline_X").val());
$("#HCenterline_X").val(x_AVG.toFixed(5));
+ //锛堟瘡澶╃殑鏁版嵁-骞冲潎鍊肩殑骞冲潎鍊硷級 涔樺钩鏂� 鍦ㄧ浉鍔�
for (var i = 1; i < option.cols[0].length; i++) {
for (var j = 0; j < option.data.length - 3; j++) {
numCount += 1;
@@ -527,9 +530,11 @@
}
}
-
+ //锛坰um闄や互锛堟墍鏈夋暟閲忓噺-1锛夛級 寮�骞虫柟 涓嶅寘鍚悗涓夎
x_PPK = Math.sqrt(calc(x_SUM, (numCount - 1), "/"));
+ //锛坰um闄や互锛堟墍鏈夋暟閲忥級锛� 寮�骞虫柟 涓嶅寘鍚悗涓夎
x_CPK = Math.sqrt(calc(x_SUM, numCount, "/"));
+
var limit = $("#limit").val();
if (parseInt(limit) >= 9) {
$("#HCenterline_S").val(x_PPK.toFixed(4));
@@ -537,52 +542,64 @@
//鍧囧�� 鎺у埗涓婇檺 鎺у埗涓嬮檺
if (limit == 1) {
+ //x鎺у埗涓婇檺 骞冲潎鍊肩殑骞冲潎鍊�+涓夊�嶇殑PPK X鎺у埗涓嬮檺 骞冲潎鍊肩殑骞冲潎鍊�-涓夊�嶇殑PPK
$("#HControlUpperLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "+").toFixed(5))
$("#HControlLowerLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "-").toFixed(5))
//璁＄畻鏍锋湰閲忎负1 鐨� ppk
+ //妫�楠岄」鐩細骞冲潎鍊�-涓嬮檺 闄や互涓夊�嶇殑PPK
var min = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(3, x_PPK, "*"), "/");
+ //妫�楠岄」鐩細涓婇檺-骞冲潎鍊� 闄や互涓夊�嶇殑PPK
var max = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(3, x_PPK, "*"), "/");
var DataHCPK = min > max ? max : min;
$("#HPPK").val(DataHCPK);
- //璁＄畻鏍锋湰閲忎负1 鐨� cpk
-
+ //璁＄畻鏍锋湰閲忎负1 鐨� cpk
var cpkSum = 0;
var CPK_U = 0;
var CPK_N = 0;
for (var i = 1; i < option.cols[0].length; i++) {
for (var j = 0; j < option.data.length - 3; j++) {
if (i == 1) {
+ //鑾峰彇绗竴琛岀殑绗竴涓��
CPK_U = option.data[j][option.cols[0][i].field];
} else {
CPK_N = option.data[j][option.cols[0][i].field];
+ //濡傛灉绗竴琛岀殑绗竴涓�煎ぇ浜庣浜屼釜鍊硷紝绗竴涓噺鍘荤浜� 鍚﹀垯灏辨槸 绗簩涓噺鍘荤涓�涓�
var data_un = CPK_U > CPK_N ? calc(CPK_U, CPK_N, "-") : calc(CPK_N, CPK_U, "-");
+ //鎶婂�肩浉鍔�
cpkSum = calc(cpkSum, data_un, "+");
CPK_U = CPK_N;
}
}
}
+ //cpkSum 闄や互 绗竴琛屾�绘暟鍑忓幓2
cpkSum = calc(cpkSum, option.cols[0].length - 2, "/");
+ //cpkSum 闄や互绯绘暟
var HAVG_CPK = calc(cpkSum, 1.128, "/");
-
+ //妫�楠岄」鐩細骞冲潎鍊�-涓嬮檺 闄や互涓夊�嶇殑HAVG_CPK
min = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(3, HAVG_CPK, "*"), "/");
+ //妫�楠岄」鐩細涓婇檺-骞冲潎鍊� 闄や互涓夊�嶇殑HAVG_CPK
max = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(3, HAVG_CPK, "*"), "/");
DataHCPK = min > max ? max : min;
$("#HCPK").val(DataHCPK);
} else {
//涓婇檺
- if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
+ if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {//涓婇檺涓嶇瓑浜庣┖锛屼笅闄愮瓑浜庣┖
+ //妫�楠岄」鐩細锛堜笂闄愬��-骞冲潎鍊硷級闄や互锛堜笁鍊嶇殑PPK 闄や互C4鐨勭郴鏁�:c4瀵瑰簲鐨勬牱鏈暟锛�
var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
$("#HPPK").val(HUpLimit.toFixed(4));
}
//涓嬮檺
- else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
+ else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {//涓嬮檺涓嶇瓑浜庣┖锛屼笂闄愮瓑浜庣┖
+ //妫�楠岄」鐩細锛堝钩鍧囧��-涓嬮檺鍊硷級闄や互锛堜笁鍊嶇殑PPK 闄や互C4鐨勭郴鏁�:c4瀵瑰簲鐨勬牱鏈暟锛�
var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
$("#HPPK").val(HDownLimit.toFixed(4));
} else {
+ //妫�楠岄」鐩細锛堜笂闄愬��-骞冲潎鍊硷級闄や互锛堜笁鍊嶇殑PPK 闄や互C4鐨勭郴鏁�:c4瀵瑰簲鐨勬牱鏈暟锛�
var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
+ //妫�楠岄」鐩細锛堝钩鍧囧��-涓嬮檺鍊硷級闄や互锛堜笁鍊嶇殑PPK 闄や互C4鐨勭郴鏁�:c4瀵瑰簲鐨勬牱鏈暟锛�
var HDownLimit = (x_AVG - calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+")) / ((3 * x_PPK) / c4[option.data.length - 4]);
$("#HPPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
}
@@ -599,6 +616,7 @@
var D3 = [0,0.000, 0.000, 0.000, 0.000, 0.000, 0.076, 0.136, 0.184, 0.223];
var D4 = [0,3.267, 2.574, 2.282, 2.114, 2.004, 1.924, 1.864, 1.816, 1.777];
+ //姹傛瀬宸�肩殑骞冲潎鍊�
for (var j = 1; j < option.cols[0].length; j++) {
if (optionAVG.length != 0 || optionS.length != 0) {
s_AVG = calc(s_AVG, parseFloat(optionS[0][option.cols[0][j].field]), "+");
@@ -606,13 +624,13 @@
}
s_AVG = calc(s_AVG, (option.cols[0].length - 1), "/")
s_AVG = $("#HCenterline_S").val() == "" || "0" ? s_AVG : parseFloat($("#HCenterline_S").val());
- $("#HCenterline_S").val(s_AVG);
+ $("#HCenterline_S").val(s_AVG);//S涓績绾�
var limit = $("#limit").val();
if (parseInt(limit) < 9) {
$("#HCenterline_S").val(s_AVG.toFixed(4));
}
-
+ //姹傚钩鍧囧�肩殑骞冲潎鍊�
for (var j = 1; j < option.cols[0].length; j++) {
if (optionAVG.length != 0 || optionS.length != 0) {
x_AVG = calc(x_AVG, parseFloat(optionAVG[0][option.cols[0][j].field]), "+");
@@ -620,33 +638,41 @@
}
x_AVG = calc(x_AVG, (option.cols[0].length - 1), "/");
x_AVG = $("#HCenterline_X").val() == "" ? x_AVG : parseFloat($("#HCenterline_X").val());
- $("#HCenterline_X").val(x_AVG.toFixed(5));
+ $("#HCenterline_X").val(x_AVG.toFixed(5));//X涓績绾�
s_CPK = calc(s_AVG, d2[option.data.length - 4], "/");
//鍧囧�� 鎺у埗涓婇檺 鎺у埗涓嬮檺
if (limit > 1) {
+ //骞冲潎鍊�+锛圓2鐨勭郴鏁颁箻浠� 鏋佸樊鍊肩殑骞冲潎鍊硷級
$("#HControlUpperLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "+").toFixed(5))
+ //骞冲潎鍊�-锛圓2鐨勭郴鏁颁箻浠� 鏋佸樊鍊肩殑骞冲潎鍊硷級
$("#HControlLowerLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "-").toFixed(5))
}
//宸�� 鎺у埗涓婇檺 鎺у埗涓嬮檺
+ //D4鐨勭郴鏁� 涔樹互 鏋佸樊鍊肩殑骞冲潎鍊�
$("#HControlUpperLimit_S").val(calc(D4[$("#limit").val() - 1], s_AVG, "*").toFixed(5));
+ //D3鐨勭郴鏁� 涔樹互 鏋佸樊鍊肩殑骞冲潎鍊�
$("#HControlLowerLimit_S").val(calc(D3[$("#limit").val() - 1], s_AVG, "*").toFixed(5));
var limit = $("#limit").val();
if (limit > 1) {
//涓婇檺
- if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
+ if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {//涓嬮檺涓嶇瓑浜庣┖锛屼笂闄愮瓑浜庣┖
+ //锛堜笂闄愬��-骞冲潎鍊硷級闄や互 涓夊�嶇殑s_CPK
var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
$("#HCPK").val(HUpLimit.toFixed(4));
}
//涓嬮檺
- else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
+ else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {//涓婇檺涓嶇瓑浜庣┖锛屼笅闄愮瓑浜庣┖
+ //锛堝钩鍧囧��-涓嬮檺鍊硷級闄や互 涓夊�嶇殑s_CPK
var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
$("#HCPK").val(HDownLimit.toFixed(4));
} else {
+ //锛堜笂闄愬��-骞冲潎鍊硷級闄や互 涓夊�嶇殑s_CPK
var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
+ //锛堝钩鍧囧��-涓嬮檺鍊硷級闄や互 涓夊�嶇殑s_CPK
var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
if (s_CPK == 0) {
$("#HCPK").val(0);
@@ -999,19 +1025,19 @@
//璁＄畻spc鍏ぇ鍒ゅ畾
function spc_judge() {
- //鍧囧��
+ //鍧囧�� 锛堜笂闄�-涓績闄愶級闄や互 3 鍒嗘垚3鍒�
var HAreaValue = calc(calc(parseFloat($("#HControlUpperLimit_X").val()), parseFloat($("#HCenterline_X").val()), "-"), 3, "/").toFixed(5);
//涓婇檺閮ㄥ垎
- var HAreaValue_A = parseFloat($("#HControlUpperLimit_X").val());
+ var HAreaValue_A = parseFloat($("#HControlUpperLimit_X").val());//涓婇檺
var HAreaValue_B = calc(calc(HAreaValue, 2, "*"), parseFloat($("#HCenterline_X").val()), "+").toFixed(5);
var HAreaValue_C = calc(calc(HAreaValue, 1, "*"), parseFloat($("#HCenterline_X").val()), "+").toFixed(5);
//涓嬮檺閮ㄥ垎
- var HAreaValue_FA = parseFloat($("#HControlLowerLimit_X").val());
+ var HAreaValue_FA = parseFloat($("#HControlLowerLimit_X").val());//涓嬮檺
var HAreaValue_FB = calc(parseFloat($("#HCenterline_X").val()),calc(HAreaValue, 2, "*"), "-").toFixed(5);
var HAreaValue_FC = calc(parseFloat($("#HCenterline_X").val()),calc(HAreaValue, 1, "*"), "-").toFixed(5);
- let HAvg = [];//骞冲潎鍊�
+ let HAvg = [];//骞冲潎鍊� 鏍规嵁X- 杩欎竴琛岃绠楃殑
for (var j = 1; j < option.cols[0].length; j++) {
if (optionAVG.length != 0) {
@@ -1022,10 +1048,14 @@
//杩炵画鍗佷簲涓偣鍦ㄤ腑蹇冪嚎涓や晶鐨凜鍖哄唴
var judge_return = [];
if (HAvg.length >= 15) {
+ //鍥犱负鏄�15涓偣 鎵�浠�14鐨勪笅鏍囧氨鏄15鏉℃暟鎹� 鐒跺悗鏄�0-15锛�1-16
for (var i = 14; i < HAvg.length; i++) {
if (HAvg[i] >= HAreaValue_FC && HAvg[i] <= HAreaValue_C) {
+ //鏍规嵁涓婇潰鐨刬鍊肩畻鍑轰粠閭ｄ釜涓嬫爣寮�濮�
for (var j = i - 14; j <= i; j++) {
+ //濡傛灉澶т簬璐焎,灏忎簬姝 閭ｅ氨鏈夐棶棰�
if (HAvg[j] >= HAreaValue_FC && HAvg[j] <= HAreaValue_C) {
+ //褰撴渶鍚庝竴鏉★紝濡傛灉澶т簬璐焎,灏忎簬姝 灏辫繘鍘昏拷鍔�15鏉℃暟鎹�
if (i == j) {
for (var j1 = i; j1 >= i - 14; j1--) {
if ($.inArray(HAvg[j1], judge_return) == -1) {
@@ -1034,7 +1064,7 @@
}
}
} else {
- break;
+ break; //缁堟褰撳墠15鏉★紝鎵ц涓嬩竴涓�15鏉�
}
}
}
@@ -1045,6 +1075,7 @@
for (var i = 13; i < HAvg.length; i++) {
var judge = [];
for (var j = i - 13; j < i; j++) {
+ //鐢ㄧ涓�涓窡绗簩鐨勫仛瀵规瘮锛岀浜屼釜璺熺涓変釜鍋氬姣旓紝浠ユ寰幆
if (HAvg[j] > HAvg[j + 1]) {
judge.push(1);
} else if (HAvg[j] < HAvg[j + 1]) {
@@ -1052,7 +1083,7 @@
}
}
for (var k = 0; k < judge.length; k++) {
- if (judge[k] + judge[k + 1] == 0) {
+ if (judge[k] + judge[k + 1] == 0) { //濡傛灉鍓嶅悗鐩稿姞绛変簬0閭ｅ氨鏄弧瓒筹紝涓嶆弧瓒冲氨鐩存帴璺冲嚭
if ((k + 1) == judge.length) {
for (var j1 = i; j1 >= i - 13; j1--) {
if ($.inArray(HAvg[j1], judge_return) == -1) {
@@ -1061,7 +1092,7 @@
}
}
} else {
- break;
+ break;//缁堟褰撳墠寰幆
}
}
}
@@ -1071,6 +1102,7 @@
if (HAvg.length >= 9) {
for (var i = 8; i < HAvg.length; i++) {
var judge = [];
+ //鐢ㄥ惊鐜殑鍊艰窡涓績绾垮姣�
for (var j = i - 8; j <= i; j++) {
if (HAvg[j] > parseFloat($("#HCenterline_X").val())) {
judge.push(1);
@@ -1078,10 +1110,12 @@
judge.push(-1);
}
}
+ //瀵瑰惊鐜殑鎻掑叆鐨勫�硷紝鐩稿姞
var sum = 0;
for (var k = 0; k < judge.length; k++) {
sum += judge[k];
}
+ //鍒ゆ柇寰幆鎻掑叆鐨勫�兼槸鍚︾瓑浜庢涔濇垨鑰呰礋涔�
if (sum == 9 || sum == -9) {
for (var j1 = i; j1 >= i - 8; j1--) {
if ($.inArray(HAvg[j1], judge_return) == -1) {
@@ -1095,9 +1129,12 @@
//杩炵画8鐐硅惤鍦ㄤ腑蹇冪嚎涓や晶涓旀棤涓�鍦–鍖轰互鍐�(鍗冲湪C鍖轰互澶�)
if (HAvg.length >= 8) {
for (var i = 7; i < HAvg.length; i++) {
+ //寰幆鐨勫�兼槸鍚﹀ぇ浜庢C 鎴栬�� 灏忎簬璐烠
if (HAvg[i] < HAreaValue_FC || HAvg[i] > HAreaValue_C) {
+ //婊¤冻 杩涜鍒ゆ柇鍓嶉潰鍊兼槸鍚︽弧瓒�
for (var j = i - 7; j <= i; j++) {
if (HAvg[j] < HAreaValue_FC || HAvg[j] > HAreaValue_C) {
+ //濡傛灉鏈�鍚庨兘婊¤冻 鎻掑叆
if (j == i) {
for (var j1 = i; j1 >= i - 7; j1--) {
if ($.inArray(HAvg[j1], judge_return) == -1) {
@@ -1106,7 +1143,7 @@
}
}
} else {
- break;
+ break; //鏈変竴涓笉婊¤冻鐩存帴缁堟褰撳墠寰幆
}
}
}
@@ -1117,6 +1154,7 @@
if (HAvg.length >= 6) {
for (var i = 5; i < HAvg.length; i++) {
var judge = [];
+ //鐢ㄧ涓�涓窡绗簩鐨勫仛瀵规瘮锛岀浜屼釜璺熺涓変釜鍋氬姣旓紝浠ユ寰幆
for (var j = i - 5; j < i; j++) {
if (HAvg[j] > HAvg[j + 1]) {
judge.push(1);
@@ -1124,10 +1162,12 @@
judge.push(-1);
}
}
+ //瀵硅拷鍔犵殑鍊� 杩涜绱姞
var sum = 0;
for (var k = 0; k < judge.length; k++) {
sum += judge[k];
}
+ //濡傛灉鏄浜旀垨鑰呰礋浜� 閭ｅ氨鍏ㄩ儴杩藉姞
if (sum == 5 || sum == -5) {
for (var j1 = i; j1 >= i - 5; j1--) {
if ($.inArray(HAvg[j1], judge_return) == -1) {
@@ -1142,15 +1182,22 @@
if (HAvg.length >= 5) {
for (var i = 4; i < HAvg.length; i++) {
var judge = [];
+ //褰撳墠鍊煎鏋滃ぇ浜� 涓績绾� 骞朵笖 澶т簬 姝
if (HAvg[i] > parseFloat($("#HCenterline_X").val()) && HAvg[i] > HAreaValue_C) {
for (var j = i - 4; j <= i; j++) {
var record = [];
+ //涓婇潰婊¤冻 鍒ゆ柇 褰撳墠鍊煎鏋滃ぇ浜� 涓績绾� 骞朵笖 澶т簬 姝
if (HAvg[j] > parseFloat($("#HCenterline_X").val()) && HAvg[j] > HAreaValue_C) {
record.push(HAvg[j]);
if (record.length >= 4) {
+ //濡傛灉婊¤冻4鏉′互涓婃暟鎹湁闂 閭ｅ氨寰幆鎶婃暟鎹彃鍏ユ暟缁�
for (var j1 = i; j1 >= i - 4; j1--) {
- if ($.inArray(HAvg[j1], judge_return) == -1) {
- judge_return.push(HAvg[j1]);
+ //鏍规嵁
+ //if ($.inArray(HAvg[j1], judge_return) == -1) {
+ // judge_return.push(HAvg[j1]);
+ //}
+ if ($.inArray(record[j1], judge_return) == -1) {
+ judge_return.push(record[j1]);
}
}
}
@@ -1158,15 +1205,21 @@
}
}
+ //褰撳墠鍊煎鏋滃皬浜� 涓績绾� 骞朵笖 灏忎簬 璐烠
else if (HAvg[i] < parseFloat($("#HCenterline_X").val()) && HAvg[i] < HAreaValue_FC) {
for (var j = i - 4; j <= i; j++) {
var record = [];
+ //涓婇潰婊¤冻 鍒ゆ柇 褰撳墠鍊煎鏋滃皬浜� 涓績绾� 骞朵笖 灏忎簬 璐烠
if (HAvg[j] < parseFloat($("#HCenterline_X").val()) && HAvg[j] < HAreaValue_FC) {
record.push(HAvg[j]);
if (record.length >= 4) {
+ //濡傛灉婊¤冻4鏉′互涓婃暟鎹湁闂 閭ｅ氨寰幆鎶婃暟鎹彃鍏ユ暟缁�
for (var j1 = i; j1 >= i - 4; j1--) {
- if ($.inArray(HAvg[j1], judge_return) == -1) {
- judge_return.push(HAvg[j1]);
+ //if ($.inArray(HAvg[j1], judge_return) == -1) {
+ // judge_return.push(HAvg[j1]);
+ //}
+ if ($.inArray(record[j1], judge_return) == -1) {
+ judge_return.push(record[j1]);
}
}
}
@@ -1182,15 +1235,21 @@
if (HAvg.length >= 3) {
for (var i = 2; i < HAvg.length; i++) {
var judge = [];
+ //褰撳墠鍊煎鏋滃ぇ浜� 涓績绾� 骞朵笖 澶т簬 姝
if (HAvg[i] > parseFloat($("#HCenterline_X").val()) && HAvg[i] > HAreaValue_B) {
for (var j = i - 2; j <= i; j++) {
var record = [];
+ //涓婇潰婊¤冻 鍒ゆ柇 褰撳墠鍊煎鏋滃ぇ浜� 涓績绾� 骞朵笖 澶т簬 姝
if (HAvg[j] > parseFloat($("#HCenterline_X").val()) && HAvg[j] > HAreaValue_B) {
record.push(HAvg[j]);
if (record.length >= 2) {
+ //濡傛灉婊¤冻2鏉′互涓婃暟鎹湁闂 閭ｅ氨寰幆鎶婃暟鎹彃鍏ユ暟缁�
for (var j1 = i; j1 >= i - 2; j1--) {
- if ($.inArray(HAvg[j1], judge_return) == -1) {
- judge_return.push(HAvg[j1]);
+ //if ($.inArray(HAvg[j1], judge_return) == -1) {
+ // judge_return.push(HAvg[j1]);
+ //}
+ if ($.inArray(record[j1], judge_return) == -1) {
+ judge_return.push(record[j1]);
}
}
}
@@ -1198,15 +1257,21 @@
}
}
+ //褰撳墠鍊煎鏋滃皬浜� 涓績绾� 骞朵笖 灏忎簬 璐烞
else if (HAvg[i] < parseFloat($("#HCenterline_X").val()) && HAvg[i] < HAreaValue_FB) {
for (var j = i - 2; j <= i; j++) {
var record = [];
+ //涓婇潰婊¤冻 鍒ゆ柇 褰撳墠鍊煎鏋滃皬浜� 涓績绾� 骞朵笖 灏忎簬 璐烞
if (HAvg[j] < parseFloat($("#HCenterline_X").val()) && HAvg[j] < HAreaValue_FB) {
record.push(HAvg[j]);
if (record.length >= 2) {
+ //濡傛灉婊¤冻2鏉′互涓婃暟鎹湁闂 閭ｅ氨寰幆鎶婃暟鎹彃鍏ユ暟缁�
for (var j1 = i; j1 >= i - 2; j1--) {
- if ($.inArray(HAvg[j1], judge_return) == -1) {
- judge_return.push(HAvg[j1]);
+ //if ($.inArray(HAvg[j1], judge_return) == -1) {
+ // judge_return.push(HAvg[j1]);
+ //}
+ if ($.inArray(record[j1], judge_return) == -1) {
+ judge_return.push(record[j1]);
}
}
}
@@ -1222,11 +1287,13 @@
if (HAvg.length >= 0) {
for (var i = 0; i < HAvg.length; i++) {
var judge = [];
+ //鍒ゆ柇褰撳墠鍊兼槸鍚﹀ぇ浜� 姝
if (HAvg[i] > HAreaValue_A) {
if ($.inArray(HAvg[i], judge_return) == -1) {
judge_return.push(HAvg[i]);
}
}
+ //鍒ゆ柇褰撳墠鍊兼槸鍚﹀ぇ浜� 璐烝
else if (HAvg[i] < HAreaValue_FA) {
if ($.inArray(HAvg[i], judge_return) == -1) {
judge_return.push(HAvg[i]);
--
Gitblit v1.9.1