From d82ef76c22fd9e44dea11067e7849f4ea893f4f5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 13 十一月 2024 17:06:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 134 +++++++++++---
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 170 ++++++++++++++++++
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 2
WebTM/views/计划管理/工艺路线/Gy_RoutingBillCheckQuery.html | 9
WebTM/views/车间管理/报表分析/Cj_HeatTreatmentTemperatureCurveChart.html | 42 ++++
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 2
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 153 ++++++++++++++++
7 files changed, 474 insertions(+), 38 deletions(-)
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_Process.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_Process.html"
index 3e2f0f5..b345950 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_Process.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_Process.html"
@@ -1190,7 +1190,7 @@
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
if (typeof (openType) != "undefined") {
- return " and 鏄庣粏鏍囪 = 'Y' and 绂佺敤鏍囪 = 'Y'";
+ return " and 鏄庣粏鏍囪 = 'Y' and 绂佺敤鏍囪 != 'Y'";
}
return "";
}
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 348ce2d..a3435e7 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -72,6 +72,11 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">鍏抽棴</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_Copy" id="set_Copy">澶嶅埗</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckFlowInfo" id="set_CheckFlowInfo">鏌ョ湅瀹℃壒杩涘害</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill_Flow" id="set_CheckBill_Flow">澶氱骇瀹℃牳</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck_Flow" id="set_AbandonCheck_Flow">澶氱骇鍙嶅鏍�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_RejectCheck_Flow" id="set_RejectCheck_Flow">椹冲洖</button>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
@@ -787,6 +792,7 @@
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
}
});
}
@@ -988,6 +994,29 @@
set_CancelCloseBill(data);
});
+ //鏌ョ湅瀹℃壒杩涘害
+ form.on('submit(set_CheckFlowInfo)', function (data) {
+ set_CheckFlowInfo();
+ });
+
+ //澶氱骇瀹℃牳
+ form.on('submit(set_CheckBill_Flow)', function (data) {
+ set_CheckBill_Flow(0);
+ });
+
+ //澶氱骇鍙嶅鏍�
+ form.on('submit(set_AbandonCheck_Flow)', function (data) {
+ set_CheckBill_Flow(1);
+ });
+ //椹冲洖
+ form.on('submit(set_RejectCheck_Flow)', function (data) {
+ set_RejectCheck_Flow();
+ });
+
+ //澶嶅埗
+ form.on('submit(set_Copy)', function (data) {
+ set_Copy();
+ });
//鏄惁榛樿宸ヨ壓
form.on('checkbox(checkboxHStandard)', function (data) {
@@ -1342,11 +1371,24 @@
//淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
- if (AllowLoadData(data)) {
- set_AddNew(data);
+ const procNos = table.cache["mainTable"].map(item => item.HProcNo);
+ if (isSortedAscending(procNos)) {
+ if (AllowLoadData(data)) {
+ set_AddNew(data);
+ }
+ } else {
+ layer.msg('璇锋敞鎰忔祦姘村彿娆″簭');
}
});
-
+ // 鍑芥暟锛氬垽鏂暟缁勬槸鍚︿粠灏忓埌澶ф帓搴�
+ function isSortedAscending(arr) {
+ for (let i = 0; i < arr.length - 1; i++) {
+ if (arr[i] > arr[i + 1]) {
+ return false;
+ }
+ }
+ return true;
+ }
//閫�鍑�
form.on('submit(btnEdit)', function (data) {
if (params[1] != null) {
@@ -1865,6 +1907,128 @@
})
}
+ //#region 澶氱骇 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill_Flow(num) {
+ var InterID = $("#HInterID").val();
+ if (InterID != 0) {
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Routing/AuditFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨璇烽�夋嫨鍦ㄥ鎵规祦鐨勫崟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 椹冲洖
+ function set_RejectCheck_Flow() {
+ var InterID = $("#HInterID").val();
+ if (InterID != 0) {
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨鍦ㄥ鎵规祦鐨勫崟鎹┏鍥烇紒');
+ }
+ }
+ //#endregion
+
+ //#region 澶嶅埗
+ function set_Copy() {
+ //鍒跺崟浜�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#hmakers").val(sessionStorage["HUserName"]);
+ $("#hmakedate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //璁剧疆hinterid
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ async: false,
+ data: { "HBillType": '3301' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+ });
+ OperationType = 2;
+ }
+ //#endregion
+
+ //#region 鏌ョ湅瀹℃壒杩涘害
+ function set_CheckFlowInfo() {
+ var InterID = $("#HInterID").val();
+ if (InterID != 0) {
+ layer.open({
+ type: 2
+ , area: ['70%', '70%']
+ , title: '鍗曟嵁瀹℃壒杩涘害'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../绯荤粺绠＄悊/澶氱骇瀹℃壒/瀹℃壒杩涘害/Xt_CheckFlowProgressList.html?linterid=' + InterID + '&HSouceBillType=3301'
+ , resize: false,
+ end: function () {
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ // $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
+ }
+ , cancel: function () {
+
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨姝ｇ‘鏁版嵁鏌ョ湅锛�');
+ }
+ }
+ //#endregion
+
//琛屽唴鍒犻櫎蹇嵎閿�
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
index c9c06a7..c821fe8 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillCheckQuery.html"
@@ -944,13 +944,14 @@
function set_RejectCheck_Flow(tableName) {
var checkStatus = table.checkStatus(tableName)
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
+ if (checkStatus.data.length !=0 ) {
+ var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//灏嗗璞℃暟缁刬d鎻愬彇鍘婚噸
+ var queryString = uniqueIds.join(",");//灏唅ds鍙樻垚鏁扮粍
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
+ url: GetWEBURL() + "/Gy_Routing/RejectAllCheckFlow", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterIDS": queryString, "CurUserID": sessionStorage["Czybm"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 0652702..78ce1ec 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -1594,7 +1594,7 @@
return data;
}
- //#endregin
+ //#endregion
//#region 鍙戣捣瀹℃壒
function set_startCheckBill() {
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/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index df0f9b7..5d81b32 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -2425,7 +2425,7 @@
//#region 瀵煎嚭Execel
function get_Export() {
var ModRightNameCheck = "Cj_StationOutBillList_ExportExcel";
-
+ var data = getExportData();
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
@@ -2433,7 +2433,6 @@
data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- var data = option.data
data.forEach((item) => {
for (let itemobj in item) {
if (item[itemobj] == null) {
@@ -2459,6 +2458,156 @@
}
//#endregion
+ //#region 鑾峰彇瀵煎嚭鏁版嵁
+ function getExportData() {
+ var data;;//瀵煎嚭鐨勬暟鎹�
+ var ajaxLoad = layer.load();
+ if (typeof (params[params[0]]) != "undefined" && lookDownBar == 0) {
+ $("#HProcExchBillNo").val(params[params[0]]);
+ $("#HBeginDate").val("1990-01-01");
+ $("#HEndDate").val("2200-12-30");
+ lookDownBar = 1;
+ }
+ var HStatus = $("select[name='HStatus']").val();//鐘舵��
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HWorkBillNo = $("#HWorkBillNo").val();
+ var HBillNo = $("#HBillNo").val();
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//澶嶉�夋
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val();
+ var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val();
+ var ColContent1 = $("#ColContent1").val();
+ var HNumber = $("#HNumber").val(); //浜у搧浠ｇ爜 鍗崇墿鏂欑紪鐮�
+ var HName = $("#HName").val(); //褰撳墠宸ュ簭
+ var HEmpNumber = $("#HEmpNumber").val(); //鎿嶄綔鍛樹唬鐮�
+ var HEmpName = $("#HEmpName").val(); //鎿嶄綔鍛樺悕绉�
+
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com = "";
+ switch (Comparator1) {
+ case "7":
+ com = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com;
+ }
+
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) >= '" + HBeginDate + "'";
+ }
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) <= '" + HEndDate + "'";
+ }
+ if (HWorkBillNo) {
+ sWhere += " and 浠诲姟鍗� like '%" + HWorkBillNo + "%'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (HProcExchBillNo) {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ }
+ if (HProcExchBillNo) {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ }
+ if (checkHWasterQty) {
+ sWhere += " and 鎶ュ簾鏁伴噺>0 ";
+ }
+ if (HNumber) {
+ sWhere += " and 浜у搧浠ｇ爜 like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and 褰撳墠宸ュ簭 like '%" + HName + "%'";
+ }
+ if (HEmpNumber) {
+ sWhere += " and 鎿嶄綔鍛樹唬鐮� like '%" + HEmpNumber + "%'";
+ }
+ if (HEmpName) {
+ sWhere += " and 鎿嶄綔鍛� like '%" + HEmpName + "%'";
+ }
+
+ if (HStatus) {
+ switch (HStatus) {
+ case '-1': //鍏ㄩ儴
+ sWhere += "";
+ break;
+ case '0': //鏈鏍�
+ sWhere += " and 瀹℃牳浜�='";
+ break;
+ case '1': //宸插鏍�
+ sWhere += " and 瀹℃牳浜�<>'";
+ break;
+ case '2': //宸插叧闂�
+ sWhere += " and 鍏抽棴浜�<>'";
+ default:
+ }
+ }
+ sWhere += " and HBillSubType<>'SUB'";
+ //鏌ヨ璇彞
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ data = data1.data;//鍒楀瓧娈垫暟鎹�
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ sWhere = "";
+ return data;
+
+ }
+ //#endregion
+
+
//鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
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 9243070..5c48d04 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"
@@ -111,6 +111,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 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栫晫闈�
@@ -151,6 +157,15 @@
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
get_FastQuery();
+ }
+
+ if (OperationType == 1) {
+ //get_HProcHBillNoId(linterid);
+ get_FastQuery();
+ } else {
+ get_FastQuery();
+ }
+
}
//鏌ヨ鏁版嵁
@@ -347,6 +362,11 @@
set_Line();
}
+ var HEquipFileNo = $("#HEquipFileNo").val();
+ sWhere = HEquipFileNo;
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
}
//閲嶇疆杩囨护鏉′欢
@@ -356,6 +376,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