From 64f72672e074c51092efd623640dcd366197fc24 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 27 一月 2026 11:09:12 +0800
Subject: [PATCH] 1
---
WebTM/views/质量管理/检验申请单/QC_Add_Edit_RequestCheckBillList.html | 373 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 261 insertions(+), 112 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\347\224\263\350\257\267\345\215\225/QC_Add_Edit_RequestCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\347\224\263\350\257\267\345\215\225/QC_Add_Edit_RequestCheckBillList.html"
index 435867d..168ee5c 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\347\224\263\350\257\267\345\215\225/QC_Add_Edit_RequestCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\347\224\263\350\257\267\345\215\225/QC_Add_Edit_RequestCheckBillList.html"
@@ -382,6 +382,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
@@ -411,6 +412,7 @@
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "7525";
+ var HModName = "Add_Edit_QC_RequestCheckBill";
//閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
var HPageTitle = get_PageTitle(HModuleType) || $("h1").html();
$("h1").html('<b>' + HPageTitle + '</b>');
@@ -485,7 +487,10 @@
};
switch (obj.event) {
-
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
+ break;
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
break;
@@ -504,6 +509,11 @@
}
});
//#endregion
+
+ // 鍦╯et_InitGrid()鍑芥暟鏈熬娣诲姞
+ DisPlay_HideColumn();
+
+
@@ -558,7 +568,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HCheckEmp', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -644,6 +654,32 @@
});
//#endregion
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HSourceOrgID").append(Organization);
+ $("#HSourceOrgID").val(sessionStorage["OrganizationID"]);
+ $("#HInspectOrgID").append(Organization);
+ $("#HInspectOrgID").val(sessionStorage["OrganizationID"]);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+
//#region 閫夋嫨鐢熶骇鐝粍寮圭獥
form.on('submit(btnSearchHGroup)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -655,7 +691,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup&openType=2', 'yes'],
+ content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -688,7 +724,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.html?Type=HShifts', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -709,40 +745,127 @@
});
//#endregion
- //鑾峰彇缁勭粐
- function Organ() {
- //鑾峰彇鐧诲綍椤电粍缁囧垪
- var Organization = '';
- $.ajax({
- type: "get",
- url: GetWEBURL() + "/Web/GetOrganizations",
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data;
- for (var i = 0; i < data.length; i++) {
- Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
- }
- $("#HSourceOrgID").append(Organization);
- $("#HSourceOrgID").val(sessionStorage["OrganizationID"]);
- $("#HInspectOrgID").append(Organization);
- $("#HInspectOrgID").val(sessionStorage["OrganizationID"]);
- form.render('select');
- }
- layer.closeAll("loading");
+
+ // 鍒楄缃嚱鏁�
+ function get_HideColumn() {
+ var colName = "";
+ var colTitleName = "";
+
+ // 鏋勫缓鍒楀悕鍜屽垪鏍囬瀛楃涓�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ colTitleName += option.cols[0][i]["title"] + ",";
+ }
+
+ // 鍘婚櫎鏈�鍚庝竴涓�楀彿骞剁紪鐮�
+ colName = encodeURI(colName.substring(0, colName.length - 1));
+
+ layer.open({
+ type: 2,
+ skin: "layui-layer-rim",
+ title: "闅愯棌鍒楄缃�",
+ closeBtn: 1,
+ shift: 2,
+ area: ["50%", "90%"],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName=' + colTitleName, "yes"],
+ btn: ["纭畾", "鍙栨秷"],
+ btn1: function (index, laero) {
+ // 鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ layer.close(index);
}
- })
+ });
}
-
-
-
+ // 鏄剧ず/闅愯棌鍒楀嚱鏁�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = data1.data[0].HGridString.split(',');
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+
+ // 闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+
+ // 璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+
+ // 璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+
+ // 鏄剧ず鍒�
+ if (dataCols[1] == 0) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+
+ // 瀛椾綋瀵归綈鏂瑰紡
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+
+ // 璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+
+ // 鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ } else {
+ break;
+ }
+ }
+
+ // 鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ },
+ error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
//#region 鏂板
form.on('submit(Add)', function (data) {
clear();
OperationType = 1;
set_AddFNew();
- //璇诲彇鏈湴瀛樺偍鏁版嵁锛屾牴鎹笂娆¤缃垵濮嬪寲鏁版嵁
+
get_ReadConfigFile();
});
//#endregion
@@ -1027,32 +1150,7 @@
}
//#endregion
- //#region 澶嶅埗
- function set_CopyFromGrid(linterid) {
- option.data = [{
- "HMaterID": 0,
- "HMaterCode": "",
- "HMaterName": "",
- "HMaterSpec": "",
- "HUnitID": 0,
- "HUnitCode": "",
- "HUnitName": "",
- "HQty": 0,
- "HSampleDamageQty": 0,
- "HSourceBillNo": "",
- "HSourceBillType": "",
- "HRelationQty": 0,
- "HRelationMoney": 0,
- "HRemark": ""
- }];
- set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
- set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- table.render(option);
-
- //瑕嗙洊鍗曟嵁鍐呯爜銆佸崟鎹彿銆佹棩鏈�
- get_MAXNum();
- }
- //#endregion
+
//#region 缂栬緫
function set_EditFromGrid(linterid) {
@@ -1177,7 +1275,7 @@
};
});
- console.log("鏄犲皠鍚庣殑鏁版嵁:", mappedData); // 璋冭瘯锛氭煡鐪嬫槧灏勭粨鏋�
+
option.data = mappedData;
} else {
@@ -1348,71 +1446,74 @@
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
if (event.key == "F7") {
-
- // 鐗╂枡淇℃伅 濡傛灉鍦ㄧ墿鏂欎唬鐮佸垪鎸塅7
- if (obj.event === 'HMaterCode') {
- var rowIndex = $(obj.tr).attr("data-index") * 1;
+ //妯″叿淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
+ if (obj.event === 'HMaterCode') //妯″叿淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
+ {
+ //椤甸潰灞�-鑷畾涔� //F7閫夋嫨妯″叿
layer.open({
type: 2,
- skin: 'layui-layer-rim',
+ skin: 'layui-layer-rim', //鍔犱笂杈规
title: '鐗╂枡鍒楄〃',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?selectMode=1', 'yes'], // 娣诲姞鍙傛暟
- btn: ['纭畾', '鍙栨秷'],
- btn1: function (index, layero) {
- var iframeWindow = window['layui-layer-iframe' + index];
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
- if (checkStatus.data.length === 0) {
- layer.msg('璇烽�夋嫨鏁版嵁');
- return;
- }
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ //if (checkStatus.data.length === 0) {
+ // return layer.msg('璇烽�夋嫨鏁版嵁');
+ //}
+ //console.log(obj.data);
- var selectedData = checkStatus.data[0];
- var HMaterID = selectedData.HItemID;
- // 鑾峰彇鐗╂枡璇︾粏淇℃伅
- $.ajax({
- url: GetWEBURL() + "/QC_RequestCheckBill/getMaterialByMaterID",
- async: false,
- type: "GET",
- data: { "HMaterID": HMaterID },
- success: function (result) {
- if (result.code == 1) {
- var materialData = result.data[0];
- obj.update({
- HMaterID: HMaterID,
- HMaterCode: materialData.HMaterNumber,
- HMaterName: materialData.HMaterName,
- HMaterSpec: materialData.HMaterModel,
- HUnitID: materialData.HUnitID,
- HUnitCode: materialData.HUnitNumber,
- HUnitName: materialData.HUnitName
- });
-
- layer.close(index);
- } else {
- layer.msg('鑾峰彇鐗╂枡淇℃伅澶辫触: ' + result.msg);
- }
- },
- error: function () {
- layer.msg('鑾峰彇鐗╂枡淇℃伅澶辫触');
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterRuleType": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HRate": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
+ btnAddLine(NewRow);
}
- });
+
+ var HMaterID = checkStatus.data[i].HItemID;
+ var resultData = getMaterialByMaterID(HMaterID);
+ option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+ option.data[rowIndex + i].HMaterCode = resultData.HMaterNumber;
+ option.data[rowIndex + i].HMaterName = resultData.HMaterName;
+ option.data[rowIndex + i].HMaterRuleType = resultData.HMaterRuleType;
+ option.data[rowIndex + i].HMaterSpec = resultData.HMaterModel;
+ option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+ option.data[rowIndex + i].HUnitCode = resultData.HUnitNumber;
+ option.data[rowIndex + i].HUnitName = resultData.HUnitName;
+
+ option.data[rowIndex + i].HDesignLife = 0;
+ option.data[rowIndex + i].HLeaveLife = 0;
+ option.data[rowIndex + i].HMoney = 0;
+
+ }
+ table.render(option);
+ layer.closeAll();
+ //layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
},
- btn2: function (index, layero) {
- // 鍙栨秷鎸夐挳
- },
- success: function (layero, index) {
- // 寮圭獥鎴愬姛鍥炶皟
+ end: function () {
+ obj.update({
+ "HMaterID": OptionData.HItemID
+ , "HMaterCode": OptionData.鐗╂枡浠ｇ爜
+ , "HMaterName": OptionData.鐗╂枡鍚嶇О
+ , "HMaterSpec": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "HUnitName": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
}
});
}
-
-
obj.event = "";
return false;
}
@@ -1553,15 +1654,63 @@
//#endregion
});
- //鍙屽嚮杩斿洖鐗╂枡
- function GetGyMaterial(data) {
- OptionData[0] = data
+ function GetGySource(obj) { //鐢熶骇璧勬簮
+ $("#HSourceName").val(obj[0].鐢熶骇璧勬簮鍚嶇О);
+ $("#HSourceID").val(obj[0].HItemID);
}
- //鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
- OptionData[0] = data
+ //鍙屽嚮杩斿洖鏂规硶
+ //鐢宠浜�
+ function GetHEmpValue(obj) {
+ $("#HCheckEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HCheckEmp").val(obj[0].HItemID);
}
+
+ //鐝
+ function GetHShiftsValue(obj) {
+ $("#HShiftsName").val(obj[0].鐝鍚嶇О);
+ $("#HShiftsID").val(obj[0].HItemID);
+ }
+ //鐝粍
+ function GetHGroupValue(obj) {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
+ //閮ㄩ棬
+ function GetHDeptNameValue(obj) {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ $("#HDeptNumber").val(obj[0].閮ㄩ棬浠ｇ爜);
+ }
+ //宸ュ簭
+ function GetProcessValue(obj) {
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(obj[0].HItemID);
+ }
+
+
+ //妫�楠岄」鐩�
+ function GetCheckItemValue(obj) {
+ OptionData = obj;
+ }
+ //妫�楠屼华鍣�
+ function GetInspectInstruMentValue(obj) {
+ OptionData = obj;
+ }
+ //璐ㄩ噺鏍囧噯
+ function GetQualityStdValue(obj) {
+ OptionData = obj;
+ }
+ //妫�楠屾柟娉�
+ function GetInspectMethodValue(obj) {
+ OptionData = obj;
+ }
+
+ //鍙屽嚮杩斿洖鐗╂枡
+ function GetGyMaterial(data) {
+ OptionData = data
+ }
+
//#region 澶勭悊灏忔暟鏄剧ず浣嶆暟
function dealDoubleToFixed(data) {
//鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
--
Gitblit v1.9.1