From 14b0abe22ae4cdfc1177eeff18fb310520ed850d Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 26 十二月 2024 12:21:15 +0800
Subject: [PATCH] 生产质量汇报单增加字段 HBadPhenomenaID int --不良现象
---
WebTM/views/基础资料/生产基础资料/Gy_BadReason.html | 1
WebTM/layuiadmin/resize/ResizeUpDow.js | 47 +++++
WebTM/layuiadmin/resize/ResizeLeftRight.js | 52 ++++++
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 158 +++++++------------
WebTM/views/质量管理/质量报表/QC_QualityDailyReprot.html | 8 +
WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html | 42 +++++
WebTM/layuiadmin/resize/ResizeUpDow.css | 33 ++++
WebTM/layuiadmin/resize/ResizeLeftRight.css | 35 ++++
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/WebTM.csproj | 4
WebTM/views/生产管理/质量汇报单/Sc_QualityReportBillSumSave.html | 66 +++++++
11 files changed, 340 insertions(+), 108 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 79fc92a..5fc1721 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -97,6 +97,10 @@
<Content Include="layuiadmin\ckou.js" />
<Content Include="layuiadmin\echarts.min.js" />
<Content Include="layuiadmin\grwebapp.js" />
+ <Content Include="layuiadmin\resize\ResizeUpDow.css" />
+ <Content Include="layuiadmin\resize\ResizeUpDow.js" />
+ <Content Include="layuiadmin\resize\ResizeLeftRight.css" />
+ <Content Include="layuiadmin\resize\ResizeLeftRight.js" />
<Content Include="layuiadmin\QueryScheme.js" />
<Content Include="layuiadmin\SetColumn.js" />
<Content Include="layuiadmin\modules\tableFilter2.js" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 77bad55..2705375 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -9,7 +9,7 @@
var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
+ /* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git a/WebTM/layuiadmin/resize/ResizeLeftRight.css b/WebTM/layuiadmin/resize/ResizeLeftRight.css
new file mode 100644
index 0000000..72fb27b
--- /dev/null
+++ b/WebTM/layuiadmin/resize/ResizeLeftRight.css
@@ -0,0 +1,35 @@
+.box {
+ width: 100%;
+ height: 1000px;
+ display: flex;
+}
+/*左侧div样式*/
+.left {
+ width: calc(30% - 5px); /*左侧初始化宽度*/
+ height: 100%;
+ /* background: #36cfc9;*/
+ float: left;
+}
+/*拖拽区div样式*/
+.resize {
+ cursor: col-resize;
+ position: relative;
+ background-color: yellow;
+ width: 5px;
+ height: 300px;
+ background-size: cover;
+ background-position: center;
+ font-size: 32px;
+ float: left;
+}
+ /*拖拽区鼠标悬停样式*/
+ .resize:hover {
+ background-color: #444444;
+ }
+/*右侧div'样式*/
+.mid {
+ float: left;
+ width: 70%; /*右侧初始化宽度*/
+ height: 100%;
+ /*background-color: #b7eb8f;*/
+}
diff --git a/WebTM/layuiadmin/resize/ResizeLeftRight.js b/WebTM/layuiadmin/resize/ResizeLeftRight.js
new file mode 100644
index 0000000..d8c4a90
--- /dev/null
+++ b/WebTM/layuiadmin/resize/ResizeLeftRight.js
@@ -0,0 +1,52 @@
+锘�(function () {
+ // 鑾峰彇鐩稿叧DOM鍏冪礌
+ let resize = document.getElementById('resize');
+ let left = document.getElementById('left');
+ let mid = document.getElementById('right');
+ let box = document.getElementById('box');
+
+ // 榧犳爣鎸変笅浜嬩欢
+ resize.onmousedown = function (e) {
+ // 璁板綍鍧愭爣璧峰浣嶇疆
+ let startX = e.clientX;
+
+ // 宸﹁竟鍏冪礌璧峰瀹藉害
+ left.left = left.offsetWidth;
+
+ // 榧犳爣鎷栧姩浜嬩欢
+ document.onmousemove = function (e) {
+ // 榧犳爣鎷栧姩鐨勭粓姝綅缃�
+ let endX = e.clientX;
+
+ // 璁＄畻绉诲姩鐨勮窛绂�
+ let moveLen = left.left + (endX - startX);
+
+ // 鑾峰彇瀹瑰櫒鐨勬渶澶у搴︼紙鎺掗櫎鎷栨嫿鏉″搴︼級
+ let maxWidth = box.clientWidth - resize.offsetWidth;
+
+ // 闄愬埗宸﹁竟鍖哄煙鐨勬渶灏忓搴︿负30px
+ if (moveLen < 300) moveLen = 300;
+
+ // 闄愬埗宸﹁竟鍖哄煙鐨勬渶澶у搴︿负鏈�澶у搴� - 鍙充晶鏈�灏忓搴�
+ if (moveLen > maxWidth - 420) moveLen = maxWidth - 420;
+
+ // 璁剧疆宸﹁竟鍖哄煙鐨勫搴�
+ left.style.width = moveLen + 'px';
+
+ // 璁剧疆鍙宠竟鍖哄煙鐨勫搴�
+ mid.style.width = (maxWidth - moveLen) + 'px';
+ };
+
+ // 榧犳爣鏉惧紑浜嬩欢
+ document.onmouseup = function (evt) {
+ document.onmousemove = null;
+ document.onmouseup = null;
+ resize.releaseCapture && resize.releaseCapture(); // 閲婃斁榧犳爣鎹曡幏
+ };
+
+ // 璁剧疆榧犳爣鎹曡幏
+ resize.setCapture && resize.setCapture();
+
+ return false; // 闃绘榛樿浜嬩欢
+ };
+})();
diff --git a/WebTM/layuiadmin/resize/ResizeUpDow.css b/WebTM/layuiadmin/resize/ResizeUpDow.css
new file mode 100644
index 0000000..7177309
--- /dev/null
+++ b/WebTM/layuiadmin/resize/ResizeUpDow.css
@@ -0,0 +1,33 @@
+.box {
+ width: 100%;
+ height: 600px; /* 设置父容器的初始高度 */
+ display: flex;
+ flex-direction: column;
+}
+
+/* 上面部分 */
+.top {
+ background-color: #36cfc9;
+ overflow: auto;
+ flex-grow: 1;
+}
+
+/* 分割条 */
+.resize {
+ cursor: ns-resize;
+ height: 5px;
+ background-color: yellow;
+ width: 100%;
+}
+
+/* 底部部分 */
+.bottom {
+ background-color: #b7eb8f;
+ overflow: auto;
+ flex-grow: 1;
+}
+
+/* 标签内容部分 */
+.layui-tab-card {
+ margin-top: 40px;
+}
diff --git a/WebTM/layuiadmin/resize/ResizeUpDow.js b/WebTM/layuiadmin/resize/ResizeUpDow.js
new file mode 100644
index 0000000..4ac262f
--- /dev/null
+++ b/WebTM/layuiadmin/resize/ResizeUpDow.js
@@ -0,0 +1,47 @@
+锘�(function () {
+ // 鑾峰彇鐩稿叧DOM鍏冪礌
+ let resize = document.getElementById('resize');
+ let top = document.getElementById('top');
+ let bottom = document.getElementById('bottom');
+ let box = document.getElementById('box');
+
+ // 榧犳爣鎸変笅浜嬩欢
+ resize.onmousedown = function (e) {
+ let startY = e.clientY;
+
+ // 璁板綍璧峰楂樺害
+ let startTopHeight = top.offsetHeight;
+ let startBottomHeight = bottom.offsetHeight;
+
+ document.onmousemove = function (e) {
+ let endY = e.clientY;
+ let moveLen = startTopHeight + (endY - startY); // 璁＄畻鏂扮殑椤堕儴楂樺害
+
+ // 鑾峰彇瀹瑰櫒鐨勬渶澶ч珮搴︼紙鎺掗櫎鎷栨嫿鏉＄殑楂樺害锛�
+ let maxHeight = box.clientHeight - resize.offsetHeight;
+
+ // 闄愬埗涓婃柟鍖哄煙鏈�灏忛珮搴�
+ if (moveLen < 30) moveLen = 30;
+
+ // 闄愬埗涓婃柟鍖哄煙鏈�澶ч珮搴�
+ if (moveLen > maxHeight - 100) moveLen = maxHeight - 100;
+
+ // 璁剧疆涓婃柟鍖哄煙鐨勯珮搴�
+ top.style.height = moveLen + 'px';
+
+ // 璁剧疆涓嬫柟鍖哄煙鐨勯珮搴�
+ bottom.style.height = (maxHeight - moveLen) + 'px';
+ };
+
+ document.onmouseup = function () {
+ document.onmousemove = null;
+ document.onmouseup = null;
+ resize.releaseCapture && resize.releaseCapture(); // 閲婃斁榧犳爣鎹曡幏
+ };
+
+ // 璁剧疆榧犳爣鎹曡幏
+ resize.setCapture && resize.setCapture();
+
+ return false; // 闃绘榛樿浜嬩欢
+ };
+})();
\ No newline at end of file
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_BadReason.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_BadReason.html"
index 0bfee42..08ff9af 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_BadReason.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_BadReason.html"
@@ -481,6 +481,7 @@
if (HProcName) {
sWhere += " and 榛樿宸ュ簭 like '%" + HProcName + "%'";
}
+ sWhere += " order by 涓嶈壇鍘熷洜浠ｇ爜";
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
index 26ade49..b606025 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
@@ -443,6 +443,8 @@
"鐢熶骇璧勬簮": "",
"HBadReasonID": "0",
"涓嶈壇鍘熷洜": "",
+ "HBadPhenomenaID": "0",
+ "涓嶈壇鐜拌薄": "",
"HBarCode": "",
"HReportType": "3",
"HRemark": "",
@@ -663,6 +665,8 @@
, { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, event: "HSource", edit: 'text' }
, { field: 'HBadReasonID', title: 'HBadReasonID', width: 100, style: "background-color:#efefef4d;", hide: true }
, { field: '涓嶈壇鍘熷洜', title: '涓嶈壇鍘熷洜', width: 150, event: "HBadReason", edit: 'text' }
+ , { field: 'HBadPhenomenaID', title: 'HBadPhenomenaID', width: 100, style: "background-color:#efefef4d;", hide: true }
+ , { field: '涓嶈壇鐜拌薄', title: '涓嶈壇鐜拌薄', width: 150, event: "HBadPhenomena", edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
, { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓诲唴鐮�', hide: true, style: 'background-color: #f9f9f9;' } //f7
@@ -723,6 +727,8 @@
"鐢熶骇璧勬簮": "",
"HBadReasonID": "0",
"涓嶈壇鍘熷洜": "",
+ "HBadPhenomenaID": "0",
+ "涓嶈壇鐜拌薄": "",
"HBarCode": "",
"HReportType": "3",
"HRemark": "",
@@ -837,6 +843,8 @@
"鐢熶骇璧勬簮": data.鐢熶骇璧勬簮,
"HBadReasonID": data.HBadReasonID,
"涓嶈壇鍘熷洜": data.涓嶈壇鍘熷洜,
+ "HBadPhenomenaID": data.HBadPhenomenaID,
+ "涓嶈壇鐜拌薄": data.涓嶈壇鐜拌薄,
"HBarCode": data.HBarCode,
"HReportType": data.HReportType,
"HRemark": data.澶囨敞,
@@ -952,6 +960,8 @@
"璐ｄ换宸ュ簭": "",
"HBadReasonID": "0",
"涓嶈壇鍘熷洜": "",
+ "HBadPhenomenaID": "0",
+ "涓嶈壇鐜拌薄": "",
"HBarCode": "",
"HReportType": "3",
"HAddr": "",
@@ -1044,6 +1054,8 @@
"妫�楠屽憳": "",
"HBadReasonID": "0",
"涓嶈壇鍘熷洜": "",
+ "HBadPhenomenaID": "0",
+ "涓嶈壇鐜拌薄": "",
"HBarCode": "",
"HReportType": "3",
"HAddr": "",
@@ -1134,6 +1146,8 @@
"妫�楠屽憳": "",
"HBadReasonID": "0",
"涓嶈壇鍘熷洜": "",
+ "HBadPhenomenaID": "0",
+ "涓嶈壇鐜拌薄": "",
"HBarCode": "",
"HReportType": "3",
"HAddr": "",
@@ -1740,6 +1754,34 @@
}
})
}
+ if (obj.event == "HBadPhenomena") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "涓嶈壇鐜拌薄" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_BadPhenomena.html', "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ obj.update({
+ "HBadPhenomenaID": checkStatus.data[0].HItemID
+ , "涓嶈壇鐜拌薄": checkStatus.data[0].涓嶈壇鐜拌薄鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
//璐ｄ换宸ュ簭鍒楄〃
if (obj.event == "HBadProcID") {
layer.open({
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 b6053da..661682a 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"
@@ -358,7 +358,9 @@
//#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
//#region 淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
- set_AddNew(data);
+ if (AllowLoadData(data)) {
+ set_AddNew(data);
+ }
});
//#endregion
@@ -390,9 +392,11 @@
"HMaterName": $("#HMaterName").val(),
"HUnitID": $("#HUnitID").val(),
"HUnitName": $("#HUnitName").val(),
- "HBadReasonID": "",
- "HBadReasonNumber": "",
+ "HBadReasonID": "0",
+ "HBadReasonNumber": "",
"HBadReasonHName": "",
+ "HBadPhenomenaID": "0",
+ "HBadPhenomenaName": "",
"HEmpID": sessionStorage["HEmpID"],
"HCheckMan": $("#HMaker").val(),
"HGroupID": $("#HGroupID").val(),
@@ -543,6 +547,8 @@
, { field: 'HBadReasonID', title: '涓嶈壇鍘熷洜id', hide: true }
, { field: 'HBadReasonNumber', title: '涓嶈壇鍘熷洜浠ｇ爜', edit: 'text' , event: "HBadReasonNumber"}
, { field: 'HBadReasonHName', title: '涓嶈壇鍘熷洜', style: 'background-color: #f9f9f9;' }
+ , { field: 'HBadPhenomenaID', title: '涓嶈壇鐜拌薄id', hide: true }
+ , { field: 'HBadPhenomenaName', title: '涓嶈壇鐜拌薄', edit: 'text', event: "HBadPhenomenaName" }
, { field: 'HEmpID', title: '妫�楠屽憳id', hide: true }
, { field: 'HCheckMan', title: '妫�楠屽憳', event: "HCheckMan" }
, { field: 'HGroupID', title: '鐝粍id', hide: true }
@@ -576,9 +582,11 @@
"HMaterName": $("#HMaterName").val(),
"HUnitID": $("#HUnitID").val(),
"HUnitName": $("#HUnitName").val(),
- "HBadReasonID": "",
+ "HBadReasonID": "0",
"HBadReasonNumber": "",
"HBadReasonHName": "",
+ "HBadPhenomenaID": "0",
+ "HBadPhenomenaName": "",
"HEmpID": sessionStorage["HEmpID"],
"HCheckMan": $("#HMaker").val(),
"HGroupID": $("#HGroupID").val(),
@@ -606,6 +614,27 @@
}
//#endregion
+ //#region 鏁版嵁鏍￠獙
+ function AllowLoadData(data) {
+ //鏁板�兼牸寮忔牎楠屽伐鍏�
+ var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
+ var temp = "";
+
+ for (var i = 0; i < option.data.length; i++) {
+ //鏁伴噺鏍煎紡鏍￠獙
+ if (option.data[i]["HBadReasonID"] == 0 || option.data[i]["HBadReasonID"] == undefined || option.data[i]["HBadReasonID"] == null) {
+ layer.msg("绗�" + (i + 1) + "琛岋細涓嶈壇鍘熷洜涓嶈兘涓虹┖锛�");
+ return false;
+ }
+ if (option.data[i]["HQty"] == 0 || option.data[i]["HQty"] == undefined || option.data[i]["HQty"] == null) {
+ layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+ return false;
+ }
+ }
+ //#endregion
+ return true;
+ }
+ //#endregion
//#region 淇濆瓨HMaker
@@ -618,7 +647,6 @@
num.push(table.cache["mainTable"][i])
}
}
-
//鑾峰彇鎿嶄綔鏂瑰紡
var refSav = "";
@@ -729,6 +757,34 @@
, btn2: function (index, layero) { }
})
}
+ if (obj.event == "HBadPhenomenaName") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "涓嶈壇鍘熷洜" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_BadPhenomena.html', "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ obj.update({
+ "HBadPhenomenaID": checkStatus.data[0].HItemID
+ , "HBadPhenomenaName": checkStatus.data[0].涓嶈壇鐜拌薄鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
if (obj.event == "HCheckMan") {
layer.open({
type: 2//寮圭獥绫诲瀷
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 ba4b279..b28ca1f 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"
@@ -8,6 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <link href="../../../layuiadmin/resize/ResizeLeftRight.css" rel="stylesheet" />
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -17,22 +18,6 @@
<script src="../../../layuiadmin/grwebapp.js"></script>
<script src="../../../layuiadmin/HideButton.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
- <style>
- .layui-tab-title .layui-this {
- background-color: #f1f1f1; /* 閫変腑鐨勯〉绛捐儗鏅壊 */
- color: #333; /* 閫変腑鐨勯〉绛炬枃瀛楅鑹� */
- }
- .resize-handle {
- width: 5px;
- height: 100%;
- background-color: yellow;
- cursor: col-resize;
- position: relative;
- float: left;
- }
-
- </style>
-
</head>
<body>
<div class="layui-fluid">
@@ -68,9 +53,9 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProcExch" id="btnHProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn">鏌ヨ</i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
@@ -120,15 +105,15 @@
</div>
</div>
</div>
- <div class="layui-row" style="padding:10px 0" id="div">
- <div class="layui-inline layui-col-xs5 " style="margin-top:20px;" id="div1">
+ <div class="box" style="padding:10px 0" id="box">
+ <div class="left" id="left" style="margin-top:20px;">
<div class="layui-tab-item layui-show">
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
</div>
</div>
<!-- 娣诲姞鐢ㄤ簬鎷栨嫿鐨勬墜鏌勫厓绱� -->
- <div id="resize-handle" class="resize-handle"></div>
- <div class="layui-inline layui-col-xs7" style="margin-top:20px;" id="div3">
+ <div id="resize" class="resize" title="鏀剁缉渚ц竟鏍�"> </div>
+ <div class="mid" id="right" style="margin-top:20px;">
<div class="layui-tab layui-tab-card">
<ul class="layui-tab-title">
<li class="layui-this">浜�</li>
@@ -209,48 +194,15 @@
</div>
</script>
<script type="text/html" id="toolbarDemo2">
-
+
</script>
</form>
</div>
</div>
</div>
</div>
+ <script src="../../../layuiadmin/resize/ResizeLeftRight.js"></script>
<script>
- // 鑾峰彇鐢ㄤ簬鎷栨嫿鐨勬墜鏌勫厓绱犱互鍙婂乏鍙充袱涓璋冩暣澶у皬鐨勫鍣ㄥ厓绱�
- const resizeHandle = document.getElementById('resize-handle');
- const leftDiv = document.getElementById('div1');
- const rightDiv = document.getElementById('div3');
-
- let startX = 0;
- let isDragging = false;
-
- // 缁欐墜鏌勬坊鍔犻紶鏍囨寜涓嬩簨浠剁洃鍚�
- resizeHandle.addEventListener('mousedown', function (e) {
- startX = e.pageX;
- isDragging = true;
- document.addEventListener('mousemove', handleMouseMove);
- document.addEventListener('mouseup', handleMouseUp);
- });
-
- function handleMouseMove(e) {
- if (isDragging) {
- const offsetX = e.pageX - startX;
- const newWidthLeft = leftDiv.offsetWidth + offsetX;
- const newWidthRight = rightDiv.offsetWidth - offsetX;
- // 闄愬埗鏈�灏忓搴︾瓑鏉′欢鍒ゆ柇锛堝彲鏍规嵁瀹為檯鎯呭喌璋冩暣锛�
- if (newWidthLeft > 100 && newWidthRight > 100) {
- leftDiv.style.width = newWidthLeft + 'px';
- rightDiv.style.width = newWidthRight + 'px';
- }
- }
- }
-
- function handleMouseUp() {
- isDragging = false;
- document.removeEventListener('mousemove', handleMouseMove);
- document.removeEventListener('mouseup', handleMouseUp);
- }
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -279,6 +231,8 @@
var option_HB_SN = ""; //榛戠櫧鏍�
var ins;
//#endregion
+
+
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -310,7 +264,7 @@
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable_HB_SN)', function (obj) {
- switch (obj.event) {
+ switch (obj.event) {
//瀵煎嚭鎸夐挳
case 'btn_Export': btn_Export();
break;
@@ -366,7 +320,7 @@
}
});
//#endregion
-
+
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
@@ -395,15 +349,15 @@
//#region 蹇�熻繃婊�
function get_FastQuery( ) {
-
+
var SN = $("#SN").val(); //SN鐮�
- var HProcHBillNo = $("#HProcHBillNo").val();//娴佽浆鍗″彿
+ var HProcHBillNo = $("#HProcHBillNo").val();//娴佽浆鍗″彿
if (HProcHBillNo != "") {
get_Display_HProc(HProcHBillNo);
} else {
get_Display(SN);
}
-
+
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
@@ -417,19 +371,19 @@
$("#HMaterName").val("");
$("#HMaterModel").val("");
$("#HProcExchBillNo").val("");
- $("#HICMOBillNo").val("");
+ $("#HICMOBillNo").val("");
$("#HProcHBillNo").val("");
var SN = "";
get_Display(SN);
}
- //#endregion
+ //#endregion
//#region 榛戠櫧鏍嘷蹇�熻繃婊�
function get_FastQuery_HB() {
var SN_HB = $("#SN_HB1").val(); //榛戞爣
var SN_BB = $("#SN_BB1").val(); //鐧芥爣
-
+
if (SN_HB) {
sWhere += " and 榛戞爣鍙� = '" + SN_HB + "'";
}
@@ -445,7 +399,7 @@
//#region 榛戠櫧鏍嘷閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery_HB() {
$("#SN_HB1").val("");
- $("#SN_BB1").val("");
+ $("#SN_BB1").val("");
sWhere = "";
}
@@ -457,7 +411,7 @@
function set_InitGrid() {
option = {
elem: '#mainTable'
- , toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo'
, totalRow: true
, height: 660
, cellMinWidth: 90
@@ -471,14 +425,14 @@
function set_InitGrid_Man() {
option_Man = {
elem: '#mainTable_Man'
- , toolbar: '#toolbarDemo2'
+ , toolbar: '#toolbarDemo2'
, totalRow: true
, height: 600
, cellMinWidth: 90
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
, cols: []
, data: []
- };
+ };
}
//鍒濆鍖栨満鍒楄〃
@@ -589,10 +543,10 @@
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/QC_CustomerAppealReport/Get_QC_FiveMenOneRingList',
- type: "GET",
+ type: "GET",
data: { "SN": SN, "user": sessionStorage["HUserName"] },
success: function (data1) {
- if (data1.count == 1) {
+ if (data1.count == 1) {
var Listcol = [];
for (var i = 0; i < data1.list.length; i++) {
var data = [];
@@ -605,7 +559,7 @@
for (var j = 0; j < data.length; j++) {
if ($.inArray(data[j].name, titleData) > -1) {
col.push({ field: data[j].id, title: data[j].name, align: 'center', hide: true }); //闅愯棌id鍒�
- }
+ }
else if (data[j].name == '娴佽浆鍗�') {//娣诲姞瓒呴摼鎺�
col.push({
field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '娴佽浆鍗�', templet: function (d) {
@@ -647,8 +601,8 @@
}
}
Listcol.push(col);
- }
-
+ }
+
//鍔ㄦ�佹樉绀哄垪鍚�
option = {
elem: '#mainTable'
@@ -667,7 +621,7 @@
, toolbar: '#toolbarDemo2'
, cols: [Listcol[1]]
, data: data1.data.h_p_QC_FiveMenOneRingList1
- , height: 'full-80'
+ , height: 'full-80'
, cellMinWidth: 90
}
table.render(option_Man);
@@ -677,7 +631,7 @@
, toolbar: '#toolbarDemo2'
, cols: [Listcol[1]]
, data: data1.data.h_p_QC_FiveMenOneRingList1
- , height: 'full-80'
+ , height: 'full-80'
, cellMinWidth: 90
}
table.render(option_Machine);
@@ -687,7 +641,7 @@
, toolbar: '#toolbarDemo2'
, cols: [Listcol[1]]
, data: data1.data.h_p_QC_FiveMenOneRingList1
- , height: 'full-80'
+ , height: 'full-80'
, cellMinWidth: 90
}
table.render(option_Material);
@@ -697,7 +651,7 @@
, toolbar: '#toolbarDemo2'
, cols: [Listcol[1]]
, data: data1.data.h_p_QC_FiveMenOneRingList1
- , height: 'full-80'
+ , height: 'full-80'
, cellMinWidth: 90
}
table.render(option_Method);
@@ -707,7 +661,7 @@
, toolbar: '#toolbarDemo2'
, cols: [Listcol[1]]
, data: data1.data.h_p_QC_FiveMenOneRingList1
- , height: 'full-80'
+ , height: 'full-80'
, cellMinWidth: 90
}
table.render(option_Environments);
@@ -717,7 +671,7 @@
, toolbar: '#toolbarDemo2'
, cols: [Listcol[1]]
, data: data1.data.h_p_QC_FiveMenOneRingList1
- , height: 'full-80'
+ , height: 'full-80'
, cellMinWidth: 90
}
table.render(option_Measure);
@@ -731,7 +685,7 @@
, cellMinWidth: 90
}
table.render(option_Message);
-
+
$("#HMaterNumber").val(data1.data.h_p_QC_FiveMenOneRingList[0].鐗╂枡浠ｇ爜);
$("#HMaterName").val(data1.data.h_p_QC_FiveMenOneRingList[0].鐗╂枡鍚嶇О);
$("#HMaterModel").val(data1.data.h_p_QC_FiveMenOneRingList[0].瑙勬牸鍨嬪彿);
@@ -740,7 +694,7 @@
$("#SN_BB").val(data1?.data?.h_p_QC_FiveMenOneRingList2?.[0]?.鐧芥爣鍙�);
$("#SN_HB").val(data1?.data?.h_p_QC_FiveMenOneRingList2?.[0]?.榛戞爣鍙�);
layer.close(ajaxLoad);
-
+
} else {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -752,7 +706,7 @@
});
}
- //#endregion
+ //#endregion
//#region 榛戠櫧鏍嘷鏌ヨ
function get_Display_HB(sWhere) {
@@ -797,7 +751,7 @@
Listcol.push(col);
}
- //鍔ㄦ�佹樉绀哄垪鍚�
+ //鍔ㄦ�佹樉绀哄垪鍚�
option_HB_SN = {
elem: '#mainTable_HB_SN'
, toolbar: '#toolbarDemo1'
@@ -837,7 +791,7 @@
type: "GET",
data: { "HProcHBillNo": HProcHBillNo, "user": sessionStorage["HUserName"] },
success: function (data1) {
- if (data1.count == 1) {
+ if (data1.count == 1) {
var linterid = data1.data[0].hmainid;
var SNs = ""; var HProcID = "";
getTable_Right(linterid, HProcID, SNs);
@@ -881,7 +835,7 @@
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
+ }
}
//#endregion
@@ -904,15 +858,15 @@
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
+ }
}
//#endregion
-
- //#endregion
+
+ //#endregion
//#region 涓昏〃鏍� 娴佽浆鍗＄偣鍑讳簨浠�
table.on('tool(mainTable)', function (obj) {
- var data = obj.data;
+ var data = obj.data;
var linterid;
var HProcID;
var SNs = $("#SN").val();
@@ -927,7 +881,7 @@
getTable_Right(linterid, HProcID, SNs);
}
});
- //#endregion
+ //#endregion
//#region 榛戠櫧鏍囬〉绛� 娴佽浆鍗＄偣鍑讳簨浠�
table.on('tool(mainTable_HB_SN)', function (obj) {
@@ -937,7 +891,7 @@
$("#SN_BB1").val(data.鐧芥爣鍙�);
get_FastQuery_HB();
}
-
+
});
//#endregion
@@ -962,7 +916,7 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
- $("#HProcHBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ $("#HProcHBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -979,7 +933,7 @@
});
//#endregion
- //#region 鍓〃鏍�
+ //#region 鍓〃鏍�
//浜�
table.on('tool(mainTable_Man)', function (obj) {
var data = obj.data;
@@ -1209,7 +1163,7 @@
, cancel: function () {
}
})
- }
+ }
} else if (obj.event == '鑱屽憳') {
var HName = data.鑱屽憳;
var HProcID = data.宸ュ簭id;
@@ -1346,9 +1300,9 @@
, cancel: function () {
}
})
- }
+ }
}
-
+
});
//鐜�
@@ -1498,7 +1452,7 @@
, cancel: function () {
}
})
- }
+ }
} else if (obj.event == '鑱屽憳') {
var HName = data.鑱屽憳;
var HProcID = data.宸ュ簭id;
@@ -1656,7 +1610,7 @@
});
- //#endregion
+ //#endregion
//#region 娴佽浆鍗＄偣鍑绘煡璇� 浜烘満鏂欐硶鐜�
function getTable_Right(linterid,HProcID,SNs) {
@@ -1838,7 +1792,7 @@
}
table.render(option);
}
-
+
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -1850,7 +1804,7 @@
}
});
}
- //#endregion
+ //#endregion
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
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_QualityDailyReprot.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_QualityDailyReprot.html"
index 298a7ff..f76310f 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_QualityDailyReprot.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_QualityDailyReprot.html"
@@ -83,6 +83,12 @@
</select>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">ID鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBatchNo1" id="HBatchNo1" >
+ </div>
+ </div>
</div>
<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
<div class="layui-inline">
@@ -322,6 +328,7 @@
var HBeginDate = $("#HBeginDate").val();
var HEndDate = $("#HEndDate").val();
var HBatchNo = $("#HBatchNo").val();
+ var HBatchNo1 = $("#HBatchNo1").val();
var HProject = $("#HProject").val();//椤圭洰鍙�
var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
@@ -333,6 +340,7 @@
HBeginDate: HBeginDate
, HEndDate: HEndDate
, HBatchNo: HBatchNo
+ , HBatchNo1: HBatchNo1
, HProject: HProject
, HBatchWork: HBatchWork
, HDivisionName: HDivisionName
--
Gitblit v1.9.1