From 6e7d1936c7041630cbf48e0fb2939d4498dde778 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 13 十一月 2024 14:52:49 +0800
Subject: [PATCH] 人机料法环增加热处理和干燥机曲线按钮
---
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 134 +++++++++++++++++++++++++++++++++++---------
WebTM/views/车间管理/报表分析/Cj_HeatTreatmentTemperatureCurveChart.html | 37 +++++++++++
2 files changed, 142 insertions(+), 29 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
index 15c0551..6dca135 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
@@ -55,7 +55,7 @@
<div class="layui-inline">
<label class="layui-form-label">宸ュ簭娴佽浆鍗�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input ForFilteringSchemes" name="HProcHBillNo" id="HProcHBillNo" >
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProcHBillNo" id="HProcHBillNo">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -179,12 +179,18 @@
</div>
</div>
<script type="text/html" id="toolbarDemo">
-
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_RCL" id="btn_RCL"><i class="layui-icon layui-icon-export"></i>鐑鐞嗘洸绾垮浘</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_GZJ" id="btn_GZJ"><i class="layui-icon layui-icon-export"></i>骞茬嚗鏈烘洸绾垮浘</button>
+ </div>
</script>
<script type="text/html" id="toolbarDemo1">
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
</div>
+ </script>
+ <script type="text/html" id="toolbarDemo2">
+
</script>
</form>
</div>
@@ -209,7 +215,7 @@
, util = layui.util
, soulTable = layui.soulTable
var sWhere = "";
- var option = ""; //浜�
+ var option = ""; //涓昏〃鏍�
var option_Man = ""; //浜�
var option_Machine = ""; //鏈�
var option_Material = ""; //鏂�
@@ -253,6 +259,17 @@
switch (obj.event) {
//瀵煎嚭鎸夐挳
case 'btn_Export': btn_Export();
+ break;
+ };
+ });
+
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鐑鐞嗘洸绾垮浘
+ case 'btn_RCL': btn_RCL();
+ break;
+ //骞茬嚗鏈烘洸绾垮浘
+ case 'btn_GZJ': btn_GZJ();
break;
};
});
@@ -391,13 +408,7 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
- , cols: [
- [
- { type: 'checkbox', fixed: 'left' }
- , { field: '娴佽浆鍗�', title: '娴佽浆鍗�', sort: true, width: 200 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true, width: 200 }
- ]
- ]
+ , cols: []
,data:[]
};
}
@@ -406,7 +417,7 @@
function set_InitGrid_Man() {
option_Man = {
elem: '#mainTable_Man'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, totalRow: true
, height: 600
, cellMinWidth: 90
@@ -420,7 +431,7 @@
function set_InitGrid_Machine() {
option_Machine = {
elem: '#mainTable_Machine'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, totalRow: true
, height: 600
, cellMinWidth: 90
@@ -434,7 +445,7 @@
function set_InitGrid_Material() {
option_Material = {
elem: '#mainTable_Material'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, totalRow: true
, height: 600
, cellMinWidth: 90
@@ -448,7 +459,7 @@
function set_InitGrid_Method() {
option_Method = {
elem: '#mainTable_Method'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, totalRow: true
, height: 600
, cellMinWidth: 90
@@ -462,6 +473,7 @@
function set_InitGrid_Environments() {
option_Environments = {
elem: '#mainTable_Environments'
+ , toolbar: '#toolbarDemo2'
, height: 600
, totalRow: true
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
@@ -473,7 +485,8 @@
//鍒濆鍖栨祴鍒楄〃
function set_InitGrid_Measure() {
option_Measure = {
- elem: '#mainTable_Measure'
+ elem: '#mainTable_Measure'
+ , toolbar: '#toolbarDemo2'
, page: false
, height: 600
, totalRow: true
@@ -559,7 +572,7 @@
option_Man = {
elem: '#mainTable_Man'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, cols: [Listcol[1]]
, data: data1.data.h_p_QC_FiveMenOneRingList1
, height: 'full-80'
@@ -569,7 +582,7 @@
option_Machine = {
elem: '#mainTable_Machine'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, cols: [Listcol[1]]
, data: data1.data.h_p_QC_FiveMenOneRingList1
, height: 'full-80'
@@ -579,7 +592,7 @@
option_Material = {
elem: '#mainTable_Material'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, cols: [Listcol[1]]
, data: data1.data.h_p_QC_FiveMenOneRingList1
, height: 'full-80'
@@ -589,7 +602,7 @@
option_Method = {
elem: '#mainTable_Method'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, cols: [Listcol[1]]
, data: data1.data.h_p_QC_FiveMenOneRingList1
, height: 'full-80'
@@ -599,7 +612,7 @@
option_Environments = {
elem: '#mainTable_Environments'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, cols: [Listcol[1]]
, data: data1.data.h_p_QC_FiveMenOneRingList1
, height: 'full-80'
@@ -609,7 +622,7 @@
option_Measure = {
elem: '#mainTable_Measure'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, cols: [Listcol[1]]
, data: data1.data.h_p_QC_FiveMenOneRingList1
, height: 'full-80'
@@ -743,6 +756,52 @@
//#region 瀵煎嚭Execel
function btn_Export() {
table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
+ //#region 鐑鐞嗘洸绾垮浘
+ function btn_RCL() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].娴佽浆鍗d;
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '鐑鐞嗘洸绾垮浘'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Cj_HeatTreatmentTemperatureCurveChart.html?OperationType=1&linterid=' + linterid+'&HSouceBillType='
+ , btn: [],
+ end: function (index, layero, that) {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
+ //#region 骞茬嚗鏈烘洸绾垮浘
+ function btn_GZJ() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].娴佽浆鍗d;
+ layer.open({
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '骞茬嚗鏈烘洸绾垮浘'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Cj_TemperatureCurveDryingMachine.html?OperationType=1&linterid=' + linterid+'&HSouceBillType='
+ , btn: [],
+ end: function (index, layero, that) {
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
}
//#endregion
@@ -1428,7 +1487,7 @@
//浜�
option_Man = {
elem: '#mainTable_Man'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, cols: [Listcol[0]]
, data: data1.data.h_p_QC_FiveMenOneRingList_Query
, height: 'full-80'
@@ -1440,7 +1499,7 @@
//鏈�
option_Machine = {
elem: '#mainTable_Machine'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, cols: [Listcol[1]]
, data: data1.data.h_p_QC_FiveMenOneRingList_Query1
, height: 'full-80'
@@ -1452,7 +1511,7 @@
//鏂�
option_Material = {
elem: '#mainTable_Material'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, cols: [Listcol[2]]
, data: data1.data.h_p_QC_FiveMenOneRingList_Query2
, height: 'full-80'
@@ -1464,7 +1523,7 @@
//娉�
option_Method = {
elem: '#mainTable_Method'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, cols: [Listcol[3]]
, data: data1.data.h_p_QC_FiveMenOneRingList_Query3
, height: 'full-80'
@@ -1475,7 +1534,7 @@
//鐜�
option_Environments = {
elem: '#mainTable_Environments'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, cols: [Listcol[4]]
, data: data1.data.h_p_QC_FiveMenOneRingList_Query4
, height: 'full-80'
@@ -1486,7 +1545,7 @@
//娴�
option_Measure = {
elem: '#mainTable_Measure'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo2'
, cols: [Listcol[5]]
, data: data1.data.h_p_QC_FiveMenOneRingList_Query5
, height: 'full-80'
@@ -1507,6 +1566,27 @@
}
//#endregion
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_HeatTreatmentTemperatureCurveChart.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_HeatTreatmentTemperatureCurveChart.html"
index 671e4a1..bd6decd 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_HeatTreatmentTemperatureCurveChart.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_HeatTreatmentTemperatureCurveChart.html"
@@ -84,6 +84,12 @@
var HModName = "Cj_HeatTreatmentTemperatureCurveChart";
//#endregion
+ var params = get_UrlVars();
+ var OperationType = params[params[0]] == undefined ? "":params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]] == undefined ? "" : params[params[1]];//婧愬崟id
+ var HSBillType = params[params[2]] == undefined ? "" : params[params[2]];//婧愬崟绫诲瀷
+
+
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栫晫闈�
@@ -111,7 +117,13 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
- get_FastQuery();
+ if (OperationType == 1) {
+ //get_HProcHBillNoId(linterid);
+ get_FastQuery();
+ } else {
+ get_FastQuery();
+ }
+
}
//鏌ヨ鏁版嵁
@@ -207,7 +219,6 @@
//蹇�熻繃婊�
function get_FastQuery() {
var HEquipFileNo = $("#HEquipFileNo").val();
-
sWhere = HEquipFileNo;
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -221,6 +232,28 @@
sWhere = "";
}
+ //鍏ㄧ▼杩芥函鎶ヨ〃浼犲叆娴佽浆鍗d 鑾峰彇璁惧缂栧彿
+ //function get_HProcHBillNoId(linterid) {
+ // var wait = layer.load();//閬僵
+ // $.ajax({
+ // url: GetWEBURL() + '/Cj_NoPassProc/GetHProcHBillNoId',
+ // type: "GET",
+ // async: false,
+ // data: { "linterid": linterid, "user": sessionStorage["HUserName"] },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+
+ // } else {
+ // layer.close(wait);
+ // layer.alert(data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.close(wait);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+ //}
+
//#endregion
});
</script>
\ No newline at end of file
--
Gitblit v1.9.1